提交测试

src/main/java/com/xzxtshiro/controller/admin/SysUserController.java

@@ -73,6 +73,13 @@ public class SysUserController {
     @ResponseBody
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     public BaseModel list(SysUser user) {
+        System.out.println("openflag================="+user.getOpenFlag());
+        System.out.println("unitcode================="+user.getUnitcode());
+        user = setQueryParam(user);
+        return userService.selectSysUserPage(user);
+    }
+
+    public static SysUser setQueryParam(SysUser user) {
         //获取当前登录用户
         SysUser dlUser = TokenUtil.getUser();
         String usergrade = dlUser.getGrade();
@@ -96,7 +103,7 @@ public class SysUserController {
             }
         }
         user.setCountycode(dw);
-        return userService.selectSysUserPage(user);
+        return user;
     }
 
     private static String subUnitCode(String usergrade, String unitcode, String dw) {
@@ -134,13 +141,6 @@ public class SysUserController {
         new ZtreeDataUtil().setUnitAndRole(model,dictitemService,userService,roleService);
     }
 
-    /**
-     * 为方便调用现在将role和unit进行拆分，并写入到service层，
-     * 因为这些东西在roleController中，userController都会不止一次调用
-     *
-     *
-     */
-
 
     /**
      * 添加用户---提交
@@ -273,12 +273,7 @@ public class SysUserController {
         }
     }
 
-    /**
-     * 跳转到批量授权页面
-     * @param userList
-     * @param model
-     * @return
-     */
+/*
     @RequestMapping(value = "/toBatchUpdate", method = RequestMethod.POST)
     public String batchUpdateInex(String userList, Model model){
         JSONArray jsonArray = JSONArray.fromObject(userList);
@@ -289,6 +284,13 @@ public class SysUserController {
         setZtreeData(model,userService,dictitemService,roleService);
         model.addAttribute("userList", choseUsers);
         return "admin/user/batchUpdate";
+    }*/
+
+
+    @RequestMapping(value = "/toNewBatchUpdate", method = RequestMethod.GET)
+    public String toOpenBatch(Model model){
+        setZtreeData(model,userService,dictitemService,roleService);
+        return "admin/user/batchUpdate";
     }
 
     /**