From fccfe2634173dcfb4a68ebe5c4c8c3e22517627d Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 23 Jan 2024 09:42:33 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=B3=95=E8=A7=84=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ProcessProjectStandardTermUser.java | 2 +- .../service/ProcessProjectStandardService.java | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java index ff61911f..20ed8c8c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java @@ -123,7 +123,7 @@ public class ProcessProjectStandardTermUser { /** * 设计工程师 */ - @Dict(dicCode = "id", dictTable = "sys_user", dicText = "CONCAT(realname, '(', username, ')')") + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") @TableField(value = "design_engineer") @ApiModelProperty(value="设计工程师") private String designEngineer; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java index 4cbf16f8..97740f64 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java @@ -888,18 +888,6 @@ public class ProcessProjectStandardService extends ServiceImpl getTermUserList(ProcessProjectStandardTermUser termUser, Integer pageNo, Integer pageSize) { Page page = new Page<>(pageNo, pageSize); Page pageList = termUserMapper.selectPageByUser(page, termUser); - //获取所有用户信息 - List userList = sysBaseAPI.getAllUser(); - Map userNameMap = new HashMap<>(); - for (LoginUser loginUser : userList) { - userNameMap.put(loginUser.getId(), loginUser.calcNameWorkNo()); - } - for (ProcessProjectStandardTermUser record : pageList.getRecords()) { - String moduleOwner = record.getModuleOwner(); - record.setModuleOwner(userNameMap.get(moduleOwner)); - String designEngineer = record.getDesignEngineer(); - record.setDesignEngineer(userNameMap.get(designEngineer)); - } return pageList; }