【修改】去掉工号+姓名字段，获取工号+姓名以唯一值进行展示处理

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

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 + ")";
+    }
+
 }

laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java

@@ -665,7 +665,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
 		LambdaQueryWrapper<SysUser> 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<SysUserMapper, SysUser> 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() + "）";
 	}
 
 

laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java

@@ -449,7 +449,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
                     LambdaQueryWrapper<SysUser> sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
                     sysUserLambdaQueryWrapper.in(SysUser::getId, valueList);
                     List<SysUser> userList = sysUserService.list(sysUserLambdaQueryWrapper);
-                    List<String> nameList = userList.stream().map(SysUser::getNameWorkNo).collect(Collectors.toList());
+                    List<String> 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())) {

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<SysUser> 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<SysUser> sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        sysUserLambdaQueryWrapper.eq(SysUser::getNameWorkNo, cellValue);
+        sysUserLambdaQueryWrapper.eq(SysUser::getUsername, cellValue);
         return Objects.nonNull(sysUserService.getOne(sysUserLambdaQueryWrapper));
     }
 

laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java

@@ -113,8 +113,8 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
 			StringJoiner joiner = new StringJoiner(",");
 			for (String id : collect) {
 				SysUser sysUser = sysUserService.getById(id);
-				if (sysUser != null && StringUtils.isNotBlank(sysUser.getWorkNo())) {
+				if (sysUser != null && StringUtils.isNotBlank(sysUser.getUsername())) {
-					joiner.add(sysUser.getWorkNo());
+					joiner.add(sysUser.getUsername());
 				}
 			}
 			workNo = joiner.toString();

laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupUserServiceImpl.java

@@ -149,7 +149,7 @@ public class LawsWorkingGroupUserServiceImpl extends ServiceImpl<LawsWorkingGrou
 			SysUser sysUser = userMap.get(user.getUserId());
 			if (sysUser != null) {
 				user.setUserName(sysUser.getRealname());
-				user.setUserWorkNo(sysUser.getWorkNo());
+				user.setUserWorkNo(sysUser.getUsername());
 				user.setUserPostName("岗位xxx");
 			}
 			LambdaQueryWrapper<SysUserRole> wrapper = Wrappers.lambdaQuery();