ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://47.97.8.94:19527/yj/zn-cloud into dev

Browse Source
This commit is contained in:
aikai 2024-09-11 10:20:05 +08:00
commit 38b932b0ac
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java
View File

@ -237,7 +237,7 @@ public class LogInstanceServiceImpl implements LogInstanceService {
List<Long> leaderUserIds = new ArrayList<>(); List<Long> leaderUserIds = new ArrayList<>();
//判断特殊情况， 只需查看各部门领导人得日志 //判断特殊情况， 只需查看各部门领导人得日志
if (pageReqVO.getIsBoss() != null && pageReqVO.getIsBoss() == 1) { if (pageReqVO.getIsProduce() == null && pageReqVO.getIsBoss() != null && pageReqVO.getIsBoss() == 1) {
//查询两级以及三级部门得领导人 //查询两级以及三级部门得领导人
//以及岗位为总监或副总监的用户 //以及岗位为总监或副总监的用户

7
yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogInstanceMapper.xml
View File

@ -147,17 +147,18 @@
<if test="pagingType == 1"> <if test="pagingType == 1">
and a.start_user_id = #{userId} and a.start_user_id = #{userId}
</if> </if>
<if test="reqVO.isBoss != null"> <if test="reqVO.isBoss != null and reqVO.isProduce == null">
and a.start_user_id in and a.start_user_id in
<foreach collection="userIds" item="userId" open="(" close=")" separator=","> <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
#{userId} #{userId}
</foreach> </foreach>
</if> </if>
</where> </where>
-- GROUP BY a.id, readStatus, readCount, unReadCount, comment GROUP BY a.id
ORDER BY ORDER BY
a.time DESC, a.time DESC,
post.sort post.sort,
a.start_user_id
</select> </select>
<select id="getNextOrUp" <select id="getNextOrUp"
resultType="cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance.LogInstanceRespVO"> resultType="cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance.LogInstanceRespVO">