diff --git a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index ea10cf50..1326335c 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -201,8 +201,6 @@ public class SysUserController { user.setPhone(phone); } - user.setNameWorkNo(user.getRealname() + "（" + user.getWorkNo() + "）"); - // 密码加盐 String password = CommonUtils.decryptBtRsaPriKey(user.getPassword(), rsaPrivateKey); user.setCreateTime(new Date());//设置创建时间 @@ -231,7 +229,6 @@ public class SysUserController { return Result.error(INEXISTENCE); }else { SysUser user = getSysUser(jsonObject, rsaPrivateKey, sysUser); - user.setNameWorkNo(user.getRealname() + "（" + user.getWorkNo() + "）"); // 修改用户走一个service 保证事务 sysUserService.editUser(user, roles, departs); return Result.OK(OPTION_SUCCESS); 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 cf805e21..b125466e 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 @@ -38,9 +38,9 @@ public class SysUser implements Serializable { private String id; /** - * 登录账号 + * 工号（也是登录账号） */ - @Excel(name = "登录账号", width = 15) + @Excel(name = "工号", width = 15) private String username; /** @@ -119,23 +119,12 @@ public class SysUser implements Serializable { @TableLogic private Integer delFlag; - /** - * 工号，唯一键 - */ - @Excel(name = "工号", width = 15) - private String workNo; - /** * 座机号 */ @Excel(name = "座机号", width = 15) private String telephone; - /** - * 姓名+工号，唯一键，例：小明（10001） - */ - private String nameWorkNo; - /** * 创建人 */ @@ -186,4 +175,16 @@ public class SysUser implements Serializable { @TableField(exist = false) private String roleCode; + + // 如下为IAM新加数据 + + + /** + * 拼接真实姓名和工号形成唯一的用户信息可用户查看 + * @return + */ + public String getNameWorkNo(){ + return this.realname + "(" + this.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 fb81f8f8..eaf4f78f 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 @@ -665,7 +665,7 @@ public class SysUserServiceImpl extends ServiceImpl impl LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.like(StringUtils.isNotBlank(userName), SysUser::getRealname, userName) - .like(StringUtils.isNotBlank(userWorkNo), SysUser::getWorkNo, userWorkNo) + .like(StringUtils.isNotBlank(userWorkNo), SysUser::getUsername, userWorkNo) .in(!userIds.isEmpty() && StringUtils.isNotBlank(userRoleName), SysUser::getId, userIds); // .like(StringUtils.isNotBlank(userPostName), SysUser::getPostName, userPostName); //目前没有岗位字段 @@ -683,7 +683,7 @@ public class SysUserServiceImpl extends ServiceImpl impl wrapper.eq(SysUser::getDelFlag, "0"); wrapper.last("limit 1"); SysUser sysUser = getOne(wrapper); - return sysUser == null ? userName : sysUser.getRealname() + "（" + sysUser.getWorkNo() + "）"; + return sysUser == null ? userName : sysUser.getRealname() + "（" + sysUser.getUsername() + "）"; } 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 013f1d7c..45285867 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 @@ -449,7 +449,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { LambdaQueryWrapper sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>(); sysUserLambdaQueryWrapper.in(SysUser::getId, valueList); List userList = sysUserService.list(sysUserLambdaQueryWrapper); - List nameList = userList.stream().map(SysUser::getNameWorkNo).collect(Collectors.toList()); + List nameList = userList.stream().map(SysUser::getUsername).collect(Collectors.toList()); resultMap.put(key + FieldCommon._DICT_TEXT, StringUtils.join(nameList, ",")); } else if (LawsFieldTypeEnum.GROUP_SINGLE.getValue().equals(lawsTag.getFieldShowType()) || LawsFieldTypeEnum.GROUP_MANY.getValue().equals(lawsTag.getFieldShowType())) { diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java index 76d9c741..470ae0f1 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java @@ -298,7 +298,7 @@ public class ImportUtil { // 单选用户转换 public String convertSingleUserId(String cellValue) { LambdaQueryWrapper sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>(); - sysUserLambdaQueryWrapper.eq(SysUser::getNameWorkNo, cellValue); + sysUserLambdaQueryWrapper.eq(SysUser::getUsername, cellValue); return sysUserService.getOne(sysUserLambdaQueryWrapper).getId(); } @@ -389,7 +389,7 @@ public class ImportUtil { // 单选人员 public boolean singleUserValid(String cellValue) { LambdaQueryWrapper sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>(); - sysUserLambdaQueryWrapper.eq(SysUser::getNameWorkNo, cellValue); + sysUserLambdaQueryWrapper.eq(SysUser::getUsername, cellValue); return Objects.nonNull(sysUserService.getOne(sysUserLambdaQueryWrapper)); } diff --git a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java index bfd95460..9b266243 100644 --- a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java +++ b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java @@ -113,8 +113,8 @@ public class LawsWorkingGroupUserController extends JeroController wrapper = Wrappers.lambdaQuery();