【修改】工作组的工号字段处理改进，更换为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 userWorkNo 工号
+	 * @param realname 姓名
+	 * @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 姓名