diff --git a/laws-base/laws-base-core/src/main/java/com/jero/common/system/vo/LoginUser.java b/laws-base/laws-base-core/src/main/java/com/jero/common/system/vo/LoginUser.java index 10bd78fe..6f82283e 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/common/system/vo/LoginUser.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/common/system/vo/LoginUser.java @@ -116,11 +116,10 @@ public class LoginUser { /**设备id uniapp推送用*/ private String clientId; - /** - * 姓名+工号，唯一键，例：小明（10001） - */ - private String nameWorkNo; - private String roleIds; + public String calcNameWorkNo(){ + return this.realname + "(" + this.username + ")"; + } + } diff --git a/laws-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java b/laws-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java index b125466e..721a54c0 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java @@ -181,9 +181,10 @@ public class SysUser implements Serializable { /** * 拼接真实姓名和工号形成唯一的用户信息可用户查看 + * 不能用get开头，否则会造成初始化queryWrapper的bug * @return */ - public String getNameWorkNo(){ + public String calcNameWorkNo(){ return this.realname + "(" + this.username + ")"; } diff --git a/laws-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java b/laws-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java index c5f358c2..e5d5f44d 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java @@ -168,5 +168,4 @@ public interface SysUserMapper extends BaseMapper { List getUserListByDepIds(@Param("departIds") List departIds); - SysUser getUserByWorkNo(String workNo); } diff --git a/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml b/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml index f2540f0d..8c373046 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml +++ b/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml @@ -215,7 +215,4 @@ - diff --git a/laws-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java b/laws-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java index 4c7da815..238ea76b 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java @@ -326,17 +326,15 @@ public interface ISysUserService extends IService { List getUserListByDepIds(List departIds); - SysUser getUserByWorkNo(String workNo); - /** * 内部工作组模糊搜索获取满足条件的用户id集合，全为空的话就返回空 - * @param userName 姓名 - * @param userWorkNo 工号 + * @param realname 姓名 + * @param username 工号 * @param userRoleName 角色 * @param userPostName 职位 * @return */ - List LawsWorkingGroupUserSearch(String userName, String userWorkNo, String userRoleName, String userPostName); + List LawsWorkingGroupUserSearch(String realname, String username, String userRoleName, String userPostName); /** * 根据username"登陆账号"返回"用户名(工号)" diff --git a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index eaf4f78f..ace74c67 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -625,11 +625,6 @@ public class SysUserServiceImpl extends ServiceImpl impl return userMapper.getUserListByDepIds(departIds); } - @Override - public SysUser getUserByWorkNo(String workNo) { - return userMapper.getUserByWorkNo(workNo); - } - /** * 内部工作组模糊搜索获取满足条件的用户id集合 * @param userName 姓名 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 45285867..4d0ca9e7 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -575,7 +575,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String now = dateFormat.format(new Date()); - String content = loginUser.getNameWorkNo() + " " + now + " 入库" + + String content = loginUser.calcNameWorkNo() + " " + now + " 入库" + standardNumber + "《" + standardName + "》"; lawsUpdateRecordService.addRecord(standardNumber, content); @@ -673,7 +673,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String now = dateFormat.format(new Date()); - recordBuffer.append(loginUser.getNameWorkNo() + " " + now + " 修改" + + recordBuffer.append(loginUser.calcNameWorkNo() + " " + now + " 修改" + standardNumber + "《" + standardName + "》，"); String oldStr = recordBuffer.toString(); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectRectifyPlanMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectRectifyPlanMapper.xml index 19290151..992e6c69 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectRectifyPlanMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectRectifyPlanMapper.xml @@ -34,7 +34,7 @@ irp.id, irp.issue, irp.rectify_measure, - u.name_work_no AS responseUser, + u.realname AS responseUser, irp.plan_complete_date, irp.actual_complete_date, irp.rectify_status diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml index 5e3e7cb5..0633a2a5 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml @@ -89,10 +89,10 @@ ad.authDeparts, p.en_standard_code, cu.cooperateDeparts, - u1.name_work_no AS mainDraftingUser, + u1.realname AS mainDraftingUser, d.depart_name AS mainDraftingUnit, - u2.name_work_no AS mainDraftingUnitResponsiblePerson, - u3.name_work_no AS standardPromoter, + u2.realname AS mainDraftingUnitResponsiblePerson, + u3.realname AS standardPromoter, p.draft_planned_complete_date, p.solicitation_draft_plan_complete_date, p.plan_approval_date, diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/WaterMarkUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/WaterMarkUtil.java index 34accdf4..8f6b44ce 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/WaterMarkUtil.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/WaterMarkUtil.java @@ -36,7 +36,7 @@ public class WaterMarkUtil { String formattedDate = currentDate.format(formatter); SysUser user = userEoService.getById(UserUtils.getUserId()); - String userName = user.getNameWorkNo(); + String userName = user.calcNameWorkNo(); return userName + " " + formattedDate; } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/library/entity/LawsProblemLibrary.java b/laws-modules/src/main/java/com/jero/modules/laws/library/entity/LawsProblemLibrary.java index 91b4409a..ab7046bd 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/library/entity/LawsProblemLibrary.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/library/entity/LawsProblemLibrary.java @@ -111,7 +111,7 @@ public class LawsProblemLibrary implements Serializable { /**发帖人id*/ @Excel(name = "发帖人id", width = 15) @ApiModelProperty(value = "发帖人id") - @Dict(dictTable = "sys_user", dicCode = "id", dicText = "name_work_no") + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username") private java.lang.String userId; /**回答列表*/ diff --git a/laws-modules/src/main/java/com/jero/modules/laws/library/service/impl/LawsProblemLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/library/service/impl/LawsProblemLibraryServiceImpl.java index 486ef8ec..6519bbf5 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/library/service/impl/LawsProblemLibraryServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/library/service/impl/LawsProblemLibraryServiceImpl.java @@ -160,7 +160,7 @@ public class LawsProblemLibraryServiceImpl extends ServiceImpl existingWorkNos = lawsWorkingGroupUserService.list().stream().map(LawsWorkingGroupUser::getWorkingGroupId).collect(Collectors.toSet()); return IntStream.range(0, all.size()) .mapToObj(i -> { - int index = i + 2; LawsWorkingGroupUser lawsWorkingGroupUser = all.get(i); - String userWorkNo = lawsWorkingGroupUser.getUserWorkNo(); - if (userWorkNo == null || userWorkNo.trim().isEmpty()) { + String username = lawsWorkingGroupUser.getUsername(); + if (username == null || username.trim().isEmpty()) { return MessageUtils.getMessage(ResultCommon.THE_JOB_NUMBER_CANNOT_BE_EMPTY_EXPORT); } - if (!isValidWorkNo(userWorkNo)) { + if (!isValidWorkNo(username)) { return MessageUtils.getMessage(ResultCommon.JOB_NUMBER_DOES_NOT_EXIST_EXPORT); } - if (!existingWorkNos.add(userWorkNo)) { + if (!existingWorkNos.add(username)) { return MessageUtils.getMessage(ResultCommon.DUPLICATE_JOB_NUMBER_EXPORT); } return null; @@ -326,7 +325,7 @@ public class LawsWorkingGroupUserController extends JeroController queryPage(LawsWorkingGroupUser lawsWorkingGroupUser, Integer pageNo, Integer pageSize, HttpServletRequest req) { Page page = new Page<>(pageNo, pageSize); - String userName = lawsWorkingGroupUser.getUserName(); - String userWorkNo = lawsWorkingGroupUser.getUserWorkNo(); + String realname = lawsWorkingGroupUser.getRealname(); + String userName = lawsWorkingGroupUser.getUsername(); String userRoleName = lawsWorkingGroupUser.getUserRoleName(); String userPostName = lawsWorkingGroupUser.getUserPostName(); String workingGroupId = lawsWorkingGroupUser.getWorkingGroupId(); - if (!StringUtils.isAllBlank(userName, userWorkNo, userRoleName, userPostName)){ - List ids = sysUserService.LawsWorkingGroupUserSearch(userName, userWorkNo, userRoleName, userPostName); + if (!StringUtils.isAllBlank(realname, userName, userRoleName, userPostName)){ + List ids = sysUserService.LawsWorkingGroupUserSearch(realname, userName, userRoleName, userPostName); if (ids.isEmpty()){ return new Page<>(); } @@ -148,9 +148,9 @@ public class LawsWorkingGroupUserServiceImpl extends ServiceImpl wrapper = Wrappers.lambdaQuery(); wrapper.eq(SysUserRole::getUserId, user.getUserId());