书记区长、区领导角色code抽成静态常亮

tip-front/src/main/java/com/minto/app/task/controller/MtTaskController.java

@@ -1646,11 +1646,10 @@ public class MtTaskController extends BaseController {
 			List<TaskMemberBean> taskMemberBeans = taskManager.findTaskMembersByTaskId(id);
 			final List<TaskMemberBean> currentMemberBeans = TaskMemberUtil.getMemberBeansByPid(taskMemberBeans, userId);
 			List<Long> shujQuzhangQuLingDaoPersonIds = null;
-			if(!user.hasRole("ShujQuzhang", "QuLingDao")){
+			if(!TaskKaizhouUtil.isShujiQuZhangQuLingDao()){
 				isNodeManager = TaskMemberUtil.isNodeManager(taskMemberBeans, currentMemberBeans, userId);
 				if(isNodeManager){
-					shujQuzhangQuLingDaoPersonIds = TaskMemberAgentUtil.getAccountPersonByRoleCodes(
-							AppContext.currentLoginAccount(), List.of("ShujQuzhang", "QuLingDao"));
+					shujQuzhangQuLingDaoPersonIds = TaskKaizhouUtil.findShuJiQuZhangQuLingDaoPersonIds();
 				}
 			}
             // 获得该事项的查看次数以及批示次数
@@ -6911,11 +6910,10 @@ public class MtTaskController extends BaseController {
 			List<TaskMemberBean> taskMemberBeans = taskManager.findTaskMembersByTaskId(id);
 			final List<TaskMemberBean> currentMemberBeans = TaskMemberUtil.getMemberBeansByPid(taskMemberBeans, userId);
 			List<Long> shujQuzhangQuLingDaoPersonIds = null;
-			if(!user.hasRole("ShujQuzhang", "QuLingDao")){
+			if(!TaskKaizhouUtil.isShujiQuZhangQuLingDao()){
 				boolean isNodeManager = TaskMemberUtil.isNodeManager(taskMemberBeans, currentMemberBeans, userId);
 				if(isNodeManager){
-					shujQuzhangQuLingDaoPersonIds = TaskMemberAgentUtil.getAccountPersonByRoleCodes(
-							AppContext.currentLoginAccount(), List.of("ShujQuzhang", "QuLingDao"));
+					shujQuzhangQuLingDaoPersonIds = TaskKaizhouUtil.findShuJiQuZhangQuLingDaoPersonIds();
 				}
 			}
 

tip-front/src/main/java/com/minto/app/task/controller/TaskByTypeController.java

@@ -8055,14 +8055,12 @@ public class TaskByTypeController extends BaseController{
                     //大角色 领导 by zhangyu 2018-10-18
                     Boolean isLeader = TaskByTypeUtil.isLeader(pid, cid);
                     model.put("isLeader",isLeader || isSuperviseBoss);
-                    if(!user.hasRole("ShujQuzhang", "QuLingDao")){
+                    if(!TaskKaizhouUtil.isShujiQuZhangQuLingDao()){
                         //检查如果是流程参与人员，不能看书记区长、区领导的批示留言数据
                         boolean isNodeManager = TaskMemberUtil.isNodeManager(taskMemberBeans, currentMemberBeans, pid);
                         if(isNodeManager){
                             //找到所有的区长书记、区领导人员，不查询这些人员的数据
-                            List<Long> shujQuzhangQuLingDaoPersonIds = TaskMemberAgentUtil.getAccountPersonByRoleCodes(
-                                    AppContext.currentLoginAccount(), List.of("ShujQuzhang", "QuLingDao"));
-                            AppContext.putThreadContext("notShowSJQZQLDpishi", shujQuzhangQuLingDaoPersonIds);
+                            AppContext.putThreadContext("notShowSJQZQLDpishi", TaskKaizhouUtil.findShuJiQuZhangQuLingDaoPersonIds());
                         }
                     }
 
@@ -8466,6 +8464,7 @@ public class TaskByTypeController extends BaseController{
         }
         return mv;
     }
+
     private Map<String, Object> getLogWhereMap(HttpServletRequest request, Map<String, Object> result) {
         Map<String, Object> whereMap = new HashMap<String, Object>();
         if(ReqUtil.getLong(request,"id")!=null){

tip-front/src/main/java/com/minto/app/task/controller/TaskController.java

@@ -3574,7 +3574,8 @@ public class TaskController extends BaseController {
 
             /** 行为记录在这里面存的  */
             manager.addTaskProcess(processBO, isHide);
-            if(flag){                //如果是领导批示，则向领导交办中添加一条数据
+            //如果是领导批示，则向领导交办中添加一条数据
+            if(flag){
                 TaskTypeBean taskType = manager.findTaskTypeBean(Long.valueOf(summ.getTaskTypeId()));
                 //manager.findTaskTypeBean(Long.valueOf(summ.getTaskTypeId()));
                 if(taskType !=null && taskType.getAutoLeaderDraft() != null && taskType.getAutoLeaderDraft().equals(BaseEnum.BooleanEnum.True.getKey())){

tip-front/src/main/java/com/minto/app/task/util/TaskKaizhouUtil.java

@@ -0,0 +1,33 @@
+package com.minto.app.task.util;
+
+import java.util.List;
+
+import com.minto.core.common.AppContext;
+
+/**
+ * 应用模块名称<p>
+ * 代码描述<p>
+ *
+ * @author wany
+ * @since 2024/6/7
+ */
+public final class TaskKaizhouUtil{
+    private static final String SHUJQUZHANG_ROLE_CODE = "ShujQuzhang";
+    private static final String QULINGDAO_ROLE_CODE = "QuLingDao";
+    /**
+     * 当前登录人是否是书记、区长、区领导角色
+     * @return
+     */
+    public static boolean isShujiQuZhangQuLingDao(){
+        return AppContext.getCurrentUser().hasRole(SHUJQUZHANG_ROLE_CODE, QULINGDAO_ROLE_CODE);
+    }
+
+    /**
+     * 查找书记、区长、区领导角色绑定的人员id
+     * @return
+     */
+    public static List<Long> findShuJiQuZhangQuLingDaoPersonIds(){
+        return TaskMemberAgentUtil.getAccountPersonByRoleCodes(AppContext.currentLoginAccount(),
+                List.of(SHUJQUZHANG_ROLE_CODE, QULINGDAO_ROLE_CODE));
+    }
+}