Merge remote-tracking branch 'origin/fix-bug-202303' into fix-bug-202303

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java

@@ -430,10 +430,17 @@ public class SysUserController {
     //@RequiresPermissions("sys:user:list")
 //    @RequestMapping(value = "/queryUserByDepId", method = RequestMethod.GET)
     @GetMapping("/queryUserByDepId")
-    public Result<List<SysUser>> queryUserByDepId(@RequestParam(name = "id", required = true) String id,@RequestParam(name="realname",required=false) String realname) {
+    public Result<List<SysUser>> queryUserByDepId(@RequestParam(name = "id", required = true) String id,@RequestParam(name="realname",required=false) String realname ,@RequestParam(name="username",required=false) String username) {
         Result<List<SysUser>> result = new Result<>();
         SysDepart sysDepart = sysDepartService.getById(id);
-        List<SysUser> userList = sysUserDepartService.queryUserByDepCode(sysDepart.getOrgCode(),realname);
+        //去除前端传回参数两边的*
+        if(StringUtils.isNotBlank(realname)){
+            realname = StringUtils.strip(realname,"*");
+        }
+        if(StringUtils.isNotBlank(username)){
+            username = StringUtils.strip(username,"*");
+        }
+        List<SysUser> userList = sysUserDepartService.queryUserByDepCode(sysDepart.getOrgCode(),realname,username);
 
         //批量查询用户的所属部门
         //step.1 先拿到全部的 useids

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserDepartMapper.java

@@ -10,7 +10,7 @@ import com.jero.modules.system.entity.SysUserDepart;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 public interface SysUserDepartMapper extends BaseMapper<SysUserDepart>{
-	
+
 	List<SysUserDepart> getUserDepartByUid(@Param("userId") String userId);
 
 	/**
@@ -19,7 +19,7 @@ public interface SysUserDepartMapper extends BaseMapper<SysUserDepart>{
 	 * @param realname
 	 * @return
 	 */
-	List<SysUser> queryDepartUserList(@Param("orgCode") String orgCode, @Param("realname") String realname);
+	List<SysUser> queryDepartUserList(@Param("orgCode") String orgCode, @Param("realname") String realname,@Param("username") String username);
 
 	/**
 	 * 根据部门查询部门用户

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserDepartMapper.xml

@@ -17,6 +17,9 @@
 		<if test="realname!=null and realname!=''">
 			and a.realname like '%${realname}%'
 		</if>
+		<if test="username!=null and username!=''">
+			and a.username like '%${username}%'
+		</if>
 	</select>
 
 	<!-- 根据部门查询部门用户 分页 -->
@@ -33,4 +36,4 @@
 		</if>
 	</select>
 
-</mapper>
+</mapper>

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserDepartService.java

@@ -19,7 +19,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  *
  */
 public interface ISysUserDepartService extends IService<SysUserDepart> {
-	
+
 
 	/**
 	 * 根据指定用户id查询部门信息
@@ -27,7 +27,7 @@ public interface ISysUserDepartService extends IService<SysUserDepart> {
 	 * @return
 	 */
 	List<DepartIdModel> queryDepartIdsOfUser(String userId);
-	
+
 
 	/**
 	 * 根据部门id查询用户信息
@@ -39,7 +39,7 @@ public interface ISysUserDepartService extends IService<SysUserDepart> {
 	/**
 	 * 根据部门code，查询当前部门和下级部门的用户信息
 	 */
-	List<SysUser> queryUserByDepCode(String depCode,String realname);
+	List<SysUser> queryUserByDepCode(String depCode,String realname,String username);
 
 	/**
 	 * 用户组件数据查询

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserDepartServiceImpl.java

@@ -98,12 +98,12 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
 	 * 根据部门code，查询当前部门和下级部门的 用户信息
 	 */
 	@Override
-	public List<SysUser> queryUserByDepCode(String depCode,String realname) {
+	public List<SysUser> queryUserByDepCode(String depCode,String realname,String unsername) {
 		//update-begin-author:taoyan date:20210422 for: 根据部门选择用户接口代码优化
 		if(oConvertUtils.isNotEmpty(realname)){
 			realname = realname.trim();
 		}
-		List<SysUser> userList = this.baseMapper.queryDepartUserList(depCode, realname);
+		List<SysUser> userList = this.baseMapper.queryDepartUserList(depCode, realname,unsername);
 		Map<String, SysUser> map = new HashMap<>();
 		for (SysUser sysUser : userList) {
 			// 返回的用户数据去掉密码信息