保管员管理

src/main/java/com/chinaitop/depot/system/controller/UserInfoController.java

@@ -1090,15 +1090,18 @@ public class UserInfoController {
 		@ApiImplicitParam(name = "pageNum", value = "条数", paramType = "query"),
 		@ApiImplicitParam(name = "orgId", value = "库ID", required=true, paramType = "query"),
 		@ApiImplicitParam(name = "roleId", value = "角色ID", required=true, paramType = "query"),
-		@ApiImplicitParam(name = "realName", value = "用户名称", paramType = "query")
+		@ApiImplicitParam(name = "realName", value = "用户名称", paramType = "query"),
+		@ApiImplicitParam(name = "userId", value = "用户ID", paramType = "query"),
+		@ApiImplicitParam(name = "notUserId", value = "不要的用户ID", paramType = "query")
 	})
-	public PageInfo<UserInfo> getUserList(Integer pageNum, Integer pageSize, Integer orgId, Integer roleId, String realName) {
+	public PageInfo<UserInfo> getUserList(Integer pageNum, Integer pageSize, Integer orgId, 
+			Integer roleId, String realName, Integer userId, Integer notUserId) {
 		if (pageNum!=null && pageSize!=null) {
 			PageHelper.startPage(pageNum, pageSize);
 		}
 		List<UserInfo> list = null;
 		try {
-			list = userInfoService.getUserList(orgId, roleId, realName);
+			list = userInfoService.getUserList(orgId, roleId, realName, userId, notUserId);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

src/main/java/com/chinaitop/depot/system/mapper/UserInfoMapper.xml

@@ -825,5 +825,11 @@
 		<if test="realName != null">
 		and a.real_name like #{realName,jdbcType=VARCHAR}
 		</if>
+		<if test="userId != null">
+		and a.user_id = #{userId,jdbcType=INTEGER}
+		</if>
+		<if test="notUserId != null">
+		and a.user_id != #{notUserId,jdbcType=INTEGER}
+		</if>
   </select>
 </mapper>

src/main/java/com/chinaitop/depot/system/service/UserInfoService.java

@@ -162,8 +162,10 @@ public interface UserInfoService {
      * @param orgId
      * @param roleId
      * @param realName
+     * @param userId
+     * @param notUserId 不要的用户ID
      * @return
      * @throws Exception
      */
-	List<UserInfo> getUserList(Integer orgId, Integer roleId, String realName) throws Exception;
+	List<UserInfo> getUserList(Integer orgId, Integer roleId, String realName, Integer userId, Integer notUserId) throws Exception;
 }

src/main/java/com/chinaitop/depot/system/service/impl/UserInfoServiceImpl.java

@@ -367,11 +367,13 @@ public class UserInfoServiceImpl implements UserInfoService {
 	}
 
 	@Override
-	public List<UserInfo> getUserList(Integer orgId, Integer roleId, String realName) throws Exception {
+	public List<UserInfo> getUserList(Integer orgId, Integer roleId, String realName, Integer userId, Integer notUserId) throws Exception {
 		Map<String, Object> map = new HashMap<>();
 		map.put("orgId", orgId);
 		map.put("roleId", roleId);
 		map.put("realName", "%"+realName+"%");
+		map.put("userId", userId);
+		map.put("notUserId", notUserId);
 		List<UserInfo> list = UserInfoMapper.queryUserList(map);
 		return list;
 	}