From 44e8e5f551af469f7ffd65918120e769d36eecda Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 26 二月 2025 16:46:53 +0800
Subject: [PATCH] 项目审核bug

---
 business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java    |    4 ++--
 business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java |   27 +++++++++++++++++++--------
 start/src/main/java/com/ycl/web/controller/system/SysDeptController.java   |    3 ++-
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
index 65c029b..0e0dd79 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -356,7 +356,7 @@
             ProjectVO projectVO = new ProjectVO();
             copyToProjectVO(vo, projectVO);
             String competentDepartment = vo.getCompetentDepartment();
-            projectVO.setAuditRole(SecurityUtils.isAdmin(SecurityUtils.getUserId()) || (StringUtils.isNotEmpty(competentDepartment) && competentDepartment.equals(SecurityUtils.getDeptId())));
+            projectVO.setAuditRole(SecurityUtils.isAdmin(SecurityUtils.getUserId()) || (StringUtils.isNotEmpty(competentDepartment) && competentDepartment.equals(SecurityUtils.getDeptId() + "")));
             // 缈昏瘧椤圭洰闃舵
             String phase = ProjectCategoryEnum.getPhaseByProjectStatus(projectVO.getProjectPhase());
             projectVO.setProjectPhase(phase);
@@ -397,7 +397,7 @@
         Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
         ProjectInfoVO vo = ProjectInfoVO.getVoByEntity(entity, null);
         String competentDepartment = vo.getCompetentDepartment();
-        vo.setAuditRole(SecurityUtils.isAdmin(SecurityUtils.getUserId()) || (StringUtils.isNotEmpty(competentDepartment) && competentDepartment.equals(SecurityUtils.getDeptId())));
+        vo.setAuditRole(SecurityUtils.isAdmin(SecurityUtils.getUserId()) || (StringUtils.isNotEmpty(competentDepartment) && competentDepartment.equals(SecurityUtils.getDeptId() + "")));
         QueryWrapper<File> fileQueryWrapper = new QueryWrapper<>();
         fileQueryWrapper.eq("type", FileTypeEnum.PROJECT_INFO.getType());
         fileQueryWrapper.eq("bus_id", vo.getId());
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
index 1e1a777..b8bd222 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -203,8 +203,6 @@
         SysUser sysUser = SecurityUtils.getLoginUser().getUser();
         identityService.setAuthenticatedUserId(sysUser.getUserId().toString());
         variables.put(ProcessConstants.PROCESS_INITIATOR, sysUser.getUserId());
-        //娴嬭瘯瀹圭己
-        variables.put("a", 10);
         // 灏嗚椤圭洰鐨勭敵璇蜂汉锛堜笟涓绘柟锛変綔涓烘祦绋嬩腑鏌愪簺鐜妭鐨勫鐞嗕汉
         variables.put(ProcessConstants.DATA_LAUNCH, "dept:" + createBy);
         ProcessInstance processInstance = runtimeService.startProcessInstanceById(processDefId, projectId + "", variables);
@@ -922,7 +920,7 @@
                         SysUser sysUser = sysUserService.selectUserById(Long.parseLong(userTask.getAssignee()));
                         if (Objects.nonNull(sysUser)) {
                             handlerIds.add(sysUser.getUserId());
-                            handlerNames.add(sysUser.getNickName());
+                            handlerNames.add(this.getUserShowName(sysUser));
                             if (Objects.nonNull(sysUser.getDept())) {
                                 handlerUnitIds.add(sysUser.getDept().getDeptId());
                                 handlerUnitNames.add(sysUser.getDept().getDeptName());
@@ -970,7 +968,7 @@
                     SysUser handlerUser = sysUserService.selectUserById(handlerUserId);
                     if (Objects.nonNull(handlerUser)) {
                         handlerIds.add(handlerUserId);
-                        handlerNames.add(handlerUser.getNickName());
+                        handlerNames.add(this.getUserShowName(handlerUser));
                         vo.setActualHandlerUserId(historicTasks.get(0).getAssignee());
                         vo.setActualHandlerUserName(handlerUser.getNickName());
                     }
@@ -1004,6 +1002,9 @@
      */
     private List<CustomerTaskVO> getFinishedProcessTaskInfo(List<UserTask> userTasks, String processInsId, String processDefId) {
         HistoricProcessInstance hisProcess = historyService.createHistoricProcessInstanceQuery().processInstanceId(processInsId).singleResult();
+        if (Objects.isNull(hisProcess)) {
+            return new ArrayList<>();
+        }
         List<CustomerTaskVO> vos = userTasks.stream().map(userTask -> {
             CustomerTaskVO vo = new CustomerTaskVO();
             vo.setProcessInsId(hisProcess.getId());
@@ -1100,7 +1101,7 @@
                 SysUser sysUser = sysUserService.selectUserById(Long.parseLong(identityLink.getUserId()));
                 if (Objects.nonNull(sysUser)) {
                     taskVO.getHandlerId().add(sysUser.getUserId());
-                    taskVO.getHandlerName().add(sysUser.getNickName());
+                    taskVO.getHandlerName().add(this.getUserShowName(sysUser));
                     if (Objects.nonNull(sysUser.getDept())) {
                         taskVO.getHandlerUnitId().add(sysUser.getDept().getDeptId());
                         taskVO.getHandlerUnitName().add(sysUser.getDept().getDeptName());
@@ -1288,9 +1289,9 @@
                 SysUser handlerUser = sysUserService.selectUserById(handlerUserId);
                 if (Objects.nonNull(handlerUser)) {
                     vo.getHandlerId().add(handlerUserId);
-                    vo.getHandlerName().add(handlerUser.getNickName());
+                    vo.getHandlerName().add(this.getUserShowName(handlerUser));
                     vo.setActualHandlerUserId(hisTask.getAssignee());
-                    vo.setActualHandlerUserName(handlerUser.getNickName());
+                    vo.setActualHandlerUserName(this.getUserShowName(handlerUser));
                 }
                 vo.setTaskDefinitionKey(hisTask.getTaskDefinitionKey());
                 this.setPromoterAndHandler(vo, hisTask.getIdentityLinks());
@@ -1301,6 +1302,16 @@
         }).collect(Collectors.toList());
         result.data(vos);
         return vos;
+    }
+
+    /**
+     * 鐢ㄦ埛鍚嶇О鍚庨潰璺熺數璇濆彿鐮�
+     *
+     * @param user
+     * @return
+     */
+    private String getUserShowName(SysUser user) {
+        return user.getNickName() + (StringUtils.isNotBlank(user.getPhonenumber()) ? "(" + user.getPhonenumber() + ")" : "");
     }
 
     /**
@@ -1877,7 +1888,7 @@
                 return user.getUserId() + "";
             }).collect(Collectors.joining("銆�")));
             taskVO.setPromoterName(userList.stream().map(user -> {
-                return user.getNickName();
+                return this.getUserShowName(user);
             }).collect(Collectors.joining("銆�")));
             taskVO.setPromoterUnitId(userList.stream().filter(user -> Objects.nonNull(user.getDept())).map(user -> {
                 return user.getDept().getDeptId() + "";
diff --git a/start/src/main/java/com/ycl/web/controller/system/SysDeptController.java b/start/src/main/java/com/ycl/web/controller/system/SysDeptController.java
index 3b16f3a..bc4529d 100644
--- a/start/src/main/java/com/ycl/web/controller/system/SysDeptController.java
+++ b/start/src/main/java/com/ycl/web/controller/system/SysDeptController.java
@@ -43,10 +43,11 @@
     private final static Long userPortId = 101L;
     //瀹℃壒绔痠d
     private final static Long approvalPortId = 102L;
+
     /**
      * 鑾峰彇閮ㄩ棬鍒楄〃
      */
-    @PreAuthorize("@ss.hasPermi('system:dept:list')")
+//    @PreAuthorize("@ss.hasPermi('system:dept:list')")
     @GetMapping("/list")
     public AjaxResult list(SysDept dept)
     {

--
Gitblit v1.8.0