Ver Fonte

员工选择

guoyujia há 1 ano atrás
pai
commit
6f07936173

+ 2 - 2
src/main/java/cn/ezhizao/project/system/controller/SysUserController.java

@@ -124,10 +124,10 @@ public class SysUserController extends BaseController {
     @PostMapping("/getUsersItemByDeptId")
     public TableDataInfo getUsersItemByDeptId(@RequestBody Map<String, Object> data) {
         startPage();
-        Long deptId = Long.parseLong(data.get("deptId").toString());
+//        Long deptId = Long.parseLong(data.get("deptId").toString());
         String userName = data.get("userName").toString();
         String nickName = data.get("nickName").toString();
-        List<SysUser> list = userService.selectUserItemByDeptId(deptId, userName, nickName);
+        List<SysUser> list = userService.selectUserItemByDeptId( userName, nickName);
         List<SysUser> distinct = list.stream().distinct().collect(Collectors.toList());
         return getDataTable(distinct);
     }

+ 1 - 1
src/main/java/cn/ezhizao/project/system/mapper/SysUserMapper.java

@@ -164,5 +164,5 @@ public interface SysUserMapper {
      * @param deptId,username,nickname 用户信息
      * @return 用户信息
      */
-    public List<SysUser> selectUserItemByDeptId(@Param("deptId") Long deptId,@Param("userName") String userName,@Param("nickName") String nickName);
+    public List<SysUser> selectUserItemByDeptId(@Param("userName") String userName,@Param("nickName") String nickName);
 }

+ 1 - 1
src/main/java/cn/ezhizao/project/system/service/ISysUserService.java

@@ -249,5 +249,5 @@ public interface ISysUserService
      * @param sysUser 用户信息
      * @return 用户信息
      */
-    List<SysUser> selectUserItemByDeptId(Long deptId,String userName,String nickName);
+    List<SysUser> selectUserItemByDeptId(String userName,String nickName);
 }

+ 2 - 2
src/main/java/cn/ezhizao/project/system/service/impl/SysUserServiceImpl.java

@@ -560,7 +560,7 @@ public class SysUserServiceImpl implements ISysUserService {
     }
 
     @Override
-    public List<SysUser> selectUserItemByDeptId(Long deptId,String userName,String nickName) {
-        return userMapper.selectUserItemByDeptId(deptId,userName,nickName);
+    public List<SysUser> selectUserItemByDeptId(String userName,String nickName) {
+        return userMapper.selectUserItemByDeptId(userName,nickName);
     }
 }

+ 1 - 3
src/main/resources/mybatis/system/SysUserMapper.xml

@@ -83,9 +83,7 @@
 		<if test="nickName != null and nickName != ''">
 			AND u.nick_name LIKE concat('%', #{nickName}, '%')
 		</if>
-		<if test="deptId != null and deptId != 0">
-			AND d.dept_id = #{deptId}
-		</if>
+
 	</select>
 	<select id="getUserByCode" parameterType="SysUser" resultMap="SysUserResult">
 		SELECT * FROM sys_user WHERE del_flag = 0 AND user_name = #{userName}