Jelajahi Sumber

update 优化工作流设计器获取任务执行人查询正常状态

疯狂的狮子Li 1 tahun lalu
induk
melakukan
339cc28249

+ 4 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteTaskAssigneeServiceImpl.java

@@ -55,6 +55,7 @@ public class RemoteTaskAssigneeServiceImpl implements RemoteTaskAssigneeService
         PageQuery pageQuery = new PageQuery(taskQuery.getPageSize(), taskQuery.getPageNum());
         QueryWrapper<SysRole> wrapper = Wrappers.query();
         wrapper.eq("r.del_flag", SystemConstants.NORMAL)
+            .eq("r.status", SystemConstants.NORMAL)
             .like(StringUtils.isNotBlank(taskQuery.getHandlerCode()), "r.role_name", taskQuery.getHandlerCode())
             .like(StringUtils.isNotBlank(taskQuery.getHandlerName()), "r.role_key", taskQuery.getHandlerName())
             .between(StringUtils.isNotBlank(taskQuery.getBeginTime()) && StringUtils.isNotBlank(taskQuery.getEndTime()),
@@ -77,6 +78,7 @@ public class RemoteTaskAssigneeServiceImpl implements RemoteTaskAssigneeService
     public RemoteTaskAssigneeVo selectPostsByTaskAssigneeList(RemoteTaskAssigneeBo taskQuery) {
         PageQuery pageQuery = new PageQuery(taskQuery.getPageSize(), taskQuery.getPageNum());
         LambdaQueryWrapper<SysPost> wrapper = Wrappers.<SysPost>lambdaQuery()
+            .eq(SysPost::getStatus, SystemConstants.NORMAL)
             .like(StringUtils.isNotBlank(taskQuery.getHandlerCode()), SysPost::getPostCategory, taskQuery.getHandlerCode())
             .like(StringUtils.isNotBlank(taskQuery.getHandlerName()), SysPost::getPostName, taskQuery.getHandlerName())
             .between(StringUtils.isNotBlank(taskQuery.getBeginTime()) && StringUtils.isNotBlank(taskQuery.getEndTime()),
@@ -108,6 +110,7 @@ public class RemoteTaskAssigneeServiceImpl implements RemoteTaskAssigneeService
         PageQuery pageQuery = new PageQuery(taskQuery.getPageSize(), taskQuery.getPageNum());
         LambdaQueryWrapper<SysDept> wrapper = Wrappers.<SysDept>lambdaQuery()
             .eq(SysDept::getDelFlag, SystemConstants.NORMAL)
+            .eq(SysDept::getStatus, SystemConstants.NORMAL)
             .like(StringUtils.isNotBlank(taskQuery.getHandlerCode()), SysDept::getDeptCategory, taskQuery.getHandlerCode())
             .like(StringUtils.isNotBlank(taskQuery.getHandlerName()), SysDept::getDeptName, taskQuery.getHandlerName())
             .between(StringUtils.isNotBlank(taskQuery.getBeginTime()) && StringUtils.isNotBlank(taskQuery.getEndTime()),
@@ -145,6 +148,7 @@ public class RemoteTaskAssigneeServiceImpl implements RemoteTaskAssigneeService
         PageQuery pageQuery = new PageQuery(taskQuery.getPageSize(), taskQuery.getPageNum());
         QueryWrapper<SysUser> wrapper = Wrappers.query();
         wrapper.eq("u.del_flag", SystemConstants.NORMAL)
+            .eq("u.status", SystemConstants.NORMAL)
             .like(StringUtils.isNotBlank(taskQuery.getHandlerCode()), "u.user_name", taskQuery.getHandlerCode())
             .like(StringUtils.isNotBlank(taskQuery.getHandlerName()), "u.nick_name", taskQuery.getHandlerName())
             .between(taskQuery.getBeginTime() != null && taskQuery.getEndTime() != null,