【修改】工作组的工号字段处理改进，更换为username字段

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

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

laws-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java

@@ -168,5 +168,4 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 
 	List<SysUser> getUserListByDepIds(@Param("departIds") List<String> departIds);
 
-    SysUser getUserByWorkNo(String workNo);
 }

laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml

@@ -215,7 +215,4 @@
 		</if>
 	</select>
 
-    <select id="getUserByWorkNo" resultType="com.jero.modules.system.entity.SysUser">
-		select * from sys_user where del_flag = 0 and work_no = #{workNo}
-	</select>
 </mapper>

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

@@ -326,17 +326,15 @@ public interface ISysUserService extends IService<SysUser> {
 
     List<SysUser> getUserListByDepIds(List<String> departIds);
 
-    SysUser getUserByWorkNo(String workNo);
-
 	/**
 	 * 内部工作组模糊搜索获取满足条件的用户id集合，全为空的话就返回空
-	 * @param userName 姓名
+	 * @param realname 姓名
-	 * @param userWorkNo 工号
+	 * @param username 工号
 	 * @param userRoleName 角色
 	 * @param userPostName 职位
 	 * @return
 	 */
-	List<String> LawsWorkingGroupUserSearch(String userName, String userWorkNo, String userRoleName, String userPostName);
+	List<String> LawsWorkingGroupUserSearch(String realname, String username, String userRoleName, String userPostName);
 
 	/**
 	 * 根据username"登陆账号"返回"用户名(工号)"

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

@@ -625,11 +625,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		return userMapper.getUserListByDepIds(departIds);
 	}
 
-	@Override
-	public SysUser getUserByWorkNo(String workNo) {
-		return userMapper.getUserByWorkNo(workNo);
-	}
-
 	/**
 	 * 内部工作组模糊搜索获取满足条件的用户id集合
 	 * @param userName 姓名

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

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

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,
+            u2.realname AS mainDraftingUnitResponsiblePerson,
-            u3.name_work_no AS standardPromoter,
+            u3.realname AS standardPromoter,
             p.draft_planned_complete_date,
             p.solicitation_draft_plan_complete_date,
             p.plan_approval_date,

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

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;
 
     /**回答列表*/

laws-modules/src/main/java/com/jero/modules/laws/library/service/impl/LawsProblemLibraryServiceImpl.java

@@ -160,7 +160,7 @@ public class LawsProblemLibraryServiceImpl extends ServiceImpl<LawsProblemLibrar
                     answer.setDepartName(sysDepartList.get(0).getDepartName());
                 }
                 answer.setAvatar(sysUser.getAvatar());
-                answer.setName(sysUser.getNameWorkNo());
+                answer.setName(sysUser.calcNameWorkNo());
             });
         }
 

laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsNewsFeed.java

@@ -97,7 +97,7 @@ public class LawsNewsFeed implements Serializable {
     private java.lang.Integer readCount;
     /**编辑人*/
     @ApiModelProperty(value = "编辑人")
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "name_work_no")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
     private String writer;
 
     /**推送范围标识（1-指定用户、2-全体用户）*/
@@ -108,7 +108,7 @@ public class LawsNewsFeed implements Serializable {
 
     @ApiModelProperty(value = "推送范围")
     @TableField(exist = false)
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "name_work_no")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
     private String pushRange;
 
     @ApiModelProperty(value = "是否可以编辑和删除")

laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java

@@ -119,10 +119,10 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
             sharing.setStandardName(standard.getStandardName());
             sharing.setStandardNumber(lawsStandardSharing.getStandardNumber());
             sharing.setSharerId(sysUser.getId());
-            sharing.setSharerName(user.getNameWorkNo());
+            sharing.setSharerName(user.calcNameWorkNo());
             sharing.setRecipientId(recipientIdList.get(i));
             SysUser userServiceById = sysUserService.getById(recipientIdList.get(i));
-            sharing.setRecipientName(userServiceById.getNameWorkNo());
+            sharing.setRecipientName(userServiceById.calcNameWorkNo());
             sharing.setSharingTime(date);
             sharing.setShareDescription(lawsStandardSharing.getShareDescription());
             sharing.setReadingStatus("1");
@@ -154,10 +154,10 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
             sharing.setStandardName(standard.getStandardName());
             sharing.setStandardNumber(lawsStandardSharing.getStandardNumber());
             sharing.setSharerId(sysUser.getId());
-            sharing.setSharerName(user.getNameWorkNo());
+            sharing.setSharerName(user.calcNameWorkNo());
             sharing.setRecipientId(recipientIdList.get(i));
             SysUser userServiceById = sysUserService.getById(recipientIdList.get(i));
-            sharing.setRecipientName(userServiceById.getNameWorkNo());
+            sharing.setRecipientName(userServiceById.calcNameWorkNo());
             sharing.setSharingTime(date);
             sharing.setShareDescription(lawsStandardSharing.getShareDescription());
             sharing.setReadingStatus("1");
@@ -189,10 +189,10 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
             sharing.setStandardName(standard.getStandardName());
             sharing.setStandardNumber(lawsStandardSharing.getStandardNumber());
             sharing.setSharerId(sysUser.getId());
-            sharing.setSharerName(user.getNameWorkNo());
+            sharing.setSharerName(user.calcNameWorkNo());
             sharing.setRecipientId(recipientIdList.get(i));
             SysUser userServiceById = sysUserService.getById(recipientIdList.get(i));
-            sharing.setRecipientName(userServiceById.getNameWorkNo());
+            sharing.setRecipientName(userServiceById.calcNameWorkNo());
             sharing.setSharingTime(date);
             sharing.setShareDescription(lawsStandardSharing.getShareDescription());
             sharing.setReadingStatus("1");
@@ -223,10 +223,10 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
 			sharing.setRubric(lawsNewsFeed.getDynamicHeading());
 			sharing.setSource(CommonConstant.STANDARD_SOURCE_4);
             sharing.setSharerId(sysUser.getId());
-            sharing.setSharerName(user.getNameWorkNo());
+            sharing.setSharerName(user.calcNameWorkNo());
             sharing.setRecipientId(recipientIdList.get(i));
             SysUser userServiceById = sysUserService.getById(recipientIdList.get(i));
-            sharing.setRecipientName(userServiceById.getNameWorkNo());
+            sharing.setRecipientName(userServiceById.calcNameWorkNo());
             sharing.setSharingTime(date);
             sharing.setShareDescription(lawsStandardSharing.getShareDescription());
             sharing.setReadingStatus("1");

laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsProjectLibraryController.java

@@ -261,7 +261,7 @@ public class LawsProjectLibraryController extends JeroController<LawsProjectLibr
 
 			 if (StringUtils.isNotBlank(projectLeader)) {
 				 SysUser sysUser = sysUserService.getById(projectLeader);
-				 aDo.setProjectLeader(sysUser.getNameWorkNo());
+				 aDo.setProjectLeader(sysUser.calcNameWorkNo());
 			 }
 		 }
 	}

laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsProjectLibraryServiceImpl.java

@@ -64,7 +64,7 @@ public class LawsProjectLibraryServiceImpl extends ServiceImpl<LawsProjectLibrar
 			String projectLeader = pageRecord.getProjectLeader();
 			if (StringUtils.isNotBlank(projectLeader)){
 				SysUser user = sysUserService.getById(projectLeader);
-				pageRecord.setNameWorkNo(user.getNameWorkNo());
+				pageRecord.setNameWorkNo(user.calcNameWorkNo());
 			}
 		}
 	}
@@ -122,7 +122,7 @@ public class LawsProjectLibraryServiceImpl extends ServiceImpl<LawsProjectLibrar
 		String projectHealth = library.getProjectHealth();
 		if (StringUtils.isNotBlank(projectLeader)){
 			SysUser user = sysUserService.getById(projectLeader);
-			library.setNameWorkNo(user.getNameWorkNo());
+			library.setNameWorkNo(user.calcNameWorkNo());
 		}
 		if (StringUtils.isNotBlank(projectSource)){
 			switch (projectSource) {

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

@@ -192,8 +192,8 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
 			 return Result.error(msg);
 		 }
 		 for (LawsWorkingGroupUser groupUser : all) {
-			 String userWorkNo = groupUser.getUserWorkNo();
+			 String username = groupUser.getUsername();
-			 SysUser userByWorkNo = sysUserService.getUserByWorkNo(userWorkNo);
+			 SysUser userByWorkNo = sysUserService.getUserByName(username);
 			 groupUser.setUserId(userByWorkNo.getId());
 			 groupUser.setWorkingGroupId(workingGroupId);
 			 groupUser.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
@@ -306,16 +306,15 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
 		 Set<String> 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();
+					 String username = lawsWorkingGroupUser.getUsername();
-					 if (userWorkNo == null || userWorkNo.trim().isEmpty()) {
+					 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<LawsWorkingGr
 	  * 判断工号在用户表中是否存在
 	  */
 	 private boolean isValidWorkNo(String userWorkNo) {
-		 SysUser sysUser = sysUserService.getUserByWorkNo(userWorkNo);
+		 SysUser sysUser = sysUserService.getUserByName(userWorkNo);
 		 return sysUser != null;
 	 }
 

laws-modules/src/main/java/com/jero/modules/sys/entity/LawsWorkingGroupUser.java

@@ -73,11 +73,11 @@ public class LawsWorkingGroupUser implements Serializable {
 
     @TableField(exist = false)
     @ApiModelProperty(value = "姓名")
-    private String userName;
+    private String realname;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "工号")
-    private String userWorkNo;
+    private String username;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "角色")

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

@@ -50,19 +50,19 @@ public class LawsWorkingGroupUserServiceImpl extends ServiceImpl<LawsWorkingGrou
 	private ISysUserRoleService sysUserRoleService;
 
     /**
-     * 分页查询
+     * 分页查询， TODO 改为一个联表查询不行吗？？
      */
     @Override
     public IPage<LawsWorkingGroupUser> queryPage(LawsWorkingGroupUser lawsWorkingGroupUser, Integer pageNo, Integer pageSize,
                         HttpServletRequest req) {
 		Page<LawsWorkingGroupUser> page = new Page<>(pageNo, pageSize);
-		String userName = lawsWorkingGroupUser.getUserName();
+		String realname = lawsWorkingGroupUser.getRealname();
-		String userWorkNo = lawsWorkingGroupUser.getUserWorkNo();
+		String userName = lawsWorkingGroupUser.getUsername();
 		String userRoleName = lawsWorkingGroupUser.getUserRoleName();
 		String userPostName = lawsWorkingGroupUser.getUserPostName();
 		String workingGroupId = lawsWorkingGroupUser.getWorkingGroupId();
-		if (!StringUtils.isAllBlank(userName, userWorkNo, userRoleName, userPostName)){
+		if (!StringUtils.isAllBlank(realname, userName, userRoleName, userPostName)){
-			List<String> ids = sysUserService.LawsWorkingGroupUserSearch(userName, userWorkNo, userRoleName, userPostName);
+			List<String> ids = sysUserService.LawsWorkingGroupUserSearch(realname, userName, userRoleName, userPostName);
 			if (ids.isEmpty()){
 				return new Page<>();
 			}
@@ -148,9 +148,9 @@ public class LawsWorkingGroupUserServiceImpl extends ServiceImpl<LawsWorkingGrou
 		for (LawsWorkingGroupUser user : list) {
 			SysUser sysUser = userMap.get(user.getUserId());
 			if (sysUser != null) {
-				user.setUserName(sysUser.getRealname());
+				user.setRealname(sysUser.getRealname());
-				user.setUserWorkNo(sysUser.getUsername());
+				user.setUsername(sysUser.getUsername());
-				user.setUserPostName("岗位xxx");
+				user.setUserPostName("岗位xxx"); // TODO 需要替换为岗位字段
 			}
 			LambdaQueryWrapper<SysUserRole> wrapper = Wrappers.lambdaQuery();
 			wrapper.eq(SysUserRole::getUserId, user.getUserId());