update: 用户管理接口增加用户状态查询参数

@@ -58,10 +58,15 @@ public class UserController {
                                         int pageSize,
                                         int pageSize,
                                 @RequestParam(value = "userName",required = false) String username,
                                 @RequestParam(value = "userName",required = false) String username,
                                 @RequestParam(value = "realName",required = false) String realname,
                                 @RequestParam(value = "realName",required = false) String realname,
-                                @RequestParam(value = "companyId",required = false) Integer companyId)
+                                @RequestParam(value = "companyId",required = false) Integer companyId,
+                                @RequestParam(value = "userStatus",required = false) Integer userStatus
+                                     )
     {
     {
-
-        PageInfo<USERS> usersPageInfo = userService.selectAllUser(pageNum,pageSize, username,  realname,companyId);
+        USERS users = new USERS();
+        users.setUsername(username);
+        users.setRealname(realname);
+        users.setUserStatus(userStatus);
+        PageInfo<USERS> usersPageInfo = userService.selectAllUser(pageNum,pageSize,  users);
         return new ResultJson("200","success",usersPageInfo);
         return new ResultJson("200","success",usersPageInfo);
     }
     }
 
 

@@ -10,7 +10,7 @@ import java.util.List;
 public interface UserService {
 public interface UserService {
     USERS loadByUsername(String username);
     USERS loadByUsername(String username);
 
 
-    PageInfo<USERS> selectAllUser(int pageNum, int pageSize,String username, String realName,Integer companyId);
+    PageInfo<USERS> selectAllUser(int pageNum, int pageSize,USERS users);
 
 
     int updateByPrimaryKeySelective(USERS record);
     int updateByPrimaryKeySelective(USERS record);
 
 

@@ -109,12 +109,8 @@ public class UserServiceImpl implements UserService{
     }
     }
 
 
     @Override
     @Override
-    public PageInfo<USERS> selectAllUser(int pageNum, int pageSize,String username, String realName,Integer companyId){
+    public PageInfo<USERS> selectAllUser(int pageNum, int pageSize,USERS users){
         Page<USERS> page =  PageHelper.startPage(pageNum,pageSize);
         Page<USERS> page =  PageHelper.startPage(pageNum,pageSize);
-        USERS users = new USERS();
-        users.setUsername(username);
-        users.setRealname(realName);
-        users.setCompanyId(companyId);
         List<USERS> list = usersMapper.selectAllUser(users);
         List<USERS> list = usersMapper.selectAllUser(users);
         for (USERS user: list) {
         for (USERS user: list) {
 //            List<PERMISSION> permissionList = permissionMapper.findByUserId(user.getUserId());
 //            List<PERMISSION> permissionList = permissionMapper.findByUserId(user.getUserId());

@@ -176,6 +176,12 @@
            <if test="realname != null and realname != ''" >
            <if test="realname != null and realname != ''" >
              and realName = #{realname,jdbcType=VARCHAR}
              and realName = #{realname,jdbcType=VARCHAR}
            </if>
            </if>
+           <if test="user_status != null" >
+             and user_status = #{userStatus,jdbcType=INTEGER}
+           </if>
+           <if test="state != null" >
+             and state = #{state,jdbcType=BIT}
+           </if>
          </where>
          </where>
     ) u
     ) u
     LEFT JOIN user_role ur ON u.user_id = ur.user_id
     LEFT JOIN user_role ur ON u.user_id = ur.user_id