shiyang / regional-platform

Download as
Browse Code »

Commit 72c747cb5e84c88cc7196eec7919544531c310c6

Authored by rui.zhang
1 parent ec267d7cdb
Exists in master and in 1 other branch nobuildprocess

platform permission 

add return pageinfo

Showing 4 changed files with 19 additions and 15 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java View file @ 72c747c
... ... @@ -163,7 +163,7 @@
163 163 @RequestMapping(value = "/departments", method = RequestMethod.GET)
164 164 @ResponseBody
165 165 @TokenRequired
166   - public void getPermissions(HttpServletResponse response,
  166 + public FrontEndResult getPermissions(HttpServletResponse response,
167 167 @RequestParam(value = "keyword", required = false) String keyword,
168 168 @RequestParam(value = "page", required = false) Integer page,
169 169 @RequestParam(value = "limit", required = false) Integer limit,
... ... @@ -191,8 +191,8 @@
191 191 frontEndResult.setData(departmentses);
192 192 frontEndResult.setPageInfo(departmentsQuery.getPageInfo());
193 193 frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS);
194   -
195   - ResultUtils.buildSuccessResultAndWrite(response, frontEndResult);
  194 + return frontEndResult;
  195 +// ResultUtils.buildSuccessResultAndWrite(response, frontEndResult);
196 196 }
197 197  
198 198  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java View file @ 72c747c
... ... @@ -178,7 +178,7 @@
178 178 @RequestMapping(value = "/organization", method = RequestMethod.GET)
179 179 @ResponseBody
180 180 @TokenRequired
181   - public void getOrganization(HttpServletResponse response,
  181 + public FrontEndResult getOrganization(HttpServletResponse response,
182 182 @RequestParam(value = "id", required = false) Integer id,
183 183 @RequestParam(value = "keyword", required = false) String keyword,
184 184 @RequestParam(value = "page", required = false) Integer page,
... ... @@ -205,7 +205,8 @@
205 205 frontEndResult.setPageInfo(organizationQuery.getPageInfo());
206 206 frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS);
207 207  
208   - ResultUtils.buildSuccessResultAndWrite(response, frontEndResult);
  208 + return frontEndResult;
  209 +// ResultUtils.buildSuccessResultAndWrite(response, frontEndResult);
209 210 }
210 211  
211 212  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java View file @ 72c747c
... ... @@ -297,7 +297,7 @@
297 297 @RequestMapping(value = "/userRoles", method = RequestMethod.GET)
298 298 @ResponseBody
299 299 @TokenRequired
300   - public void getUserList(HttpServletResponse response,
  300 + public FrontEndResult getUserList(HttpServletResponse response,
301 301 @RequestParam(value = "keyword",required = false) String keyword,
302 302 @RequestParam(value = "page",required = false) Integer page,
303 303 @RequestParam(value = "limit",required = false) Integer limit,
... ... @@ -322,7 +322,9 @@
322 322 frontEndResult.setData(roles);
323 323 frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS);
324 324  
325   - ResultUtils.buildSuccessResultAndWrite(response, frontEndResult);
  325 + return frontEndResult;
  326 +
  327 + // ResultUtils.buildSuccessResultAndWrite(response, frontEndResult);
326 328 }
327 329  
328 330  
... ... @@ -332,7 +334,7 @@
332 334 @RequestMapping(value = "/adminRoles", method = RequestMethod.GET)
333 335 @ResponseBody
334 336 @TokenRequired
335   - public void getAdminList(HttpServletResponse response,
  337 + public FrontEndResult getAdminList(HttpServletResponse response,
336 338 @RequestParam(value = "keyword",required = false) String keyword,
337 339 @RequestParam(value = "page",required = false) Integer page,
338 340 @RequestParam(value = "limit",required = false) Integer limit) {
... ... @@ -356,8 +358,8 @@
356 358 frontEndResult.setPageInfo(rolesQuery.getPageInfo());
357 359 frontEndResult.setData(roles);
358 360 frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS);
359   -
360   - ResultUtils.buildSuccessResultAndWrite(response, frontEndResult);
  361 + return frontEndResult;
  362 +// ResultUtils.buildSuccessResultAndWrite(response, frontEndResult);
361 363 }
362 364 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java View file @ 72c747c
... ... @@ -61,7 +61,7 @@
61 61 @RequestMapping(value = "/admins", method = RequestMethod.GET)
62 62 @ResponseBody
63 63 @TokenRequired
64   - public void getAdminList(HttpServletResponse response,
  64 + public FrontEndResult getAdminList(HttpServletResponse response,
65 65 @RequestParam(value = "keyword", required = false) String keyword,
66 66 @RequestParam(value = "rolesId", required = false) Integer rolesId,
67 67 @RequestParam(value = "page", required = false) Integer page,
... ... @@ -93,8 +93,8 @@
93 93 frontEndResult.setPageInfo(usersQuery.getPageInfo());
94 94 frontEndResult.setData(users);
95 95 frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS);
96   -
97   - ResultUtils.buildSuccessResultAndWrite(response, frontEndResult);
  96 + return frontEndResult;
  97 +// ResultUtils.buildSuccessResultAndWrite(response, frontEndResult);
98 98 }
99 99  
100 100  
... ... @@ -105,7 +105,7 @@
105 105 @RequestMapping(value = "/users", method = RequestMethod.GET)
106 106 @TokenRequired
107 107 @ResponseBody
108   - public void getPermissions(HttpServletResponse response,
  108 + public FrontEndResult getPermissions(HttpServletResponse response,
109 109 @RequestParam(value = "keyword", required = false) String keyword,
110 110 @RequestParam(value = "rolesId", required = false) Integer rolesId,
111 111 @RequestParam(value = "page", required = false) Integer page,
... ... @@ -143,7 +143,8 @@
143 143 frontEndResult.setData(users);
144 144 frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS);
145 145  
146   - ResultUtils.buildSuccessResultAndWrite(response, frontEndResult);
  146 + return frontEndResult;
  147 +// ResultUtils.buildSuccessResultAndWrite(response, frontEndResult);
147 148 }
148 149  
149 150 //获取用户角色信息