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; }