--工作台-待办任务支持按用户角色显示待办任务

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/page/controller/PageTitleconfigController.java

@@ -13,6 +13,8 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.stm.baosong.entity.BaosongTaskRecord;
 import org.jeecg.modules.stm.baosong.service.IBaosongTaskRecordService;
 import org.jeecg.modules.stm.page.entity.PageTitleconfig;
+import org.jeecg.modules.system.entity.SysUserRole;
+import org.jeecg.modules.system.service.ISysUserRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -24,10 +26,8 @@ import org.jeecg.modules.stm.rectify.plan.service.IStRectifyPlanService;
 import org.jeecg.modules.stm.utils.UserUtil;
 
 import jakarta.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -46,6 +46,8 @@ public class PageTitleconfigController extends JeecgController<PageTitleconfig,
 
     @Autowired
     private IBaosongTaskRecordService baosongTaskRecordService;
+    @Autowired
+    private ISysUserRoleService sysUserRoleService;
 
     @GetMapping(value = "/list")
     public Result<IPage<PageTitleconfig>> queryPageList(PageTitleconfig pageTitleconfig,
@@ -90,7 +92,30 @@ public class PageTitleconfigController extends JeecgController<PageTitleconfig,
         //获取待办事项列表，待审批和待填报
         QueryWrapper<MyTask> queryWrapper = new QueryWrapper();
         String userId = UserUtil.getUserId();
-        queryWrapper.eq("sta",0).eq("uid",userId).orderByDesc("priority").orderByDesc("st_time");
+        String roleids="";
+        List<SysUserRole> userRole = sysUserRoleService.list(new QueryWrapper<SysUserRole>().lambda().eq(SysUserRole::getUserId, userId));
+        for(int u=0;u<userRole.size();u++){
+            SysUserRole sysUserRole=userRole.get(u);
+            roleids=roleids+sysUserRole.getRoleId()+",";
+        }
+        if(!roleids.equals("")){
+            roleids=roleids.substring(0,roleids.length()-1);
+
+        }
+        // 创建一个最终变量或实际上的最终变量用于 lambda
+        final String finalRoleids = roleids;
+
+        //queryWrapper.eq("sta",0).eq("uid",userId).orderByDesc("priority").orderByDesc("st_time");
+        // 修改：uid 和 roleid 是 OR 关系
+        queryWrapper.eq("sta", 0)
+                .and(wrapper -> {
+                    wrapper.eq("uid", userId);
+                    if(!"".equals(finalRoleids)){
+                        wrapper.or().in("roleid", Arrays.asList(finalRoleids.split(",")));
+                    }
+                })
+                .orderByDesc("priority")
+                .orderByDesc("st_time");
         queryWrapper.last("limit 5");
         List<MyTask> list = myTaskService.list(queryWrapper);
         return Result.OK(list);