jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit de0253a0075c6ceefbdcb429b00c046e8cec42f4

Authored by jiangjiazhi
2 parents c351d87b15 18e90b9b4f
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java View file @ de0253a
... ... @@ -77,11 +77,11 @@
77 77 @TokenRequired
78 78 public void addDepartments(HttpServletResponse response,
79 79 @PathVariable(value = "id") Integer id,
80   - @RequestParam(value = "pid") Integer pid,
81   - @RequestParam(value = "name") String name,
82   - @RequestParam(value = "orgId") Integer orgId,
83   - @RequestParam(value = "description") String description,
84   - @RequestParam(value = "shortCode") String shortCode) {
  80 + @RequestParam(value = "pid", required = false) Integer pid,
  81 + @RequestParam(value = "name", required = false) String name,
  82 + @RequestParam(value = "orgId", required = false) Integer orgId,
  83 + @RequestParam(value = "description", required = false) String description,
  84 + @RequestParam(value = "shortCode", required = false) String shortCode) {
85 85  
86 86 if (null == name || null == id) {
87 87 ResultUtils.buildParameterErrorResultAndWrite(response);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java View file @ de0253a
... ... @@ -329,7 +329,8 @@
329 329 @RequestParam(value = "keyword",required = false) String keyword,
330 330 @RequestParam(value = "page",required = false) Integer page,
331 331 @RequestParam(value = "limit",required = false) Integer limit,
332   - @RequestParam(value = "orgId", required = false) Integer orgId) {
  332 + @RequestParam(value = "orgId", required = false) Integer orgId,
  333 + @RequestParam(value = "enable", required = false) Integer enable) {
333 334  
334 335 limit = limit == null ? 10 : limit;
335 336 page = page == null ? 1 : page;
... ... @@ -342,6 +343,7 @@
342 343 rolesQuery.setKeyword(keyword);
343 344 rolesQuery.setPage(page);
344 345 rolesQuery.setLimit(limit);
  346 + rolesQuery.setEnable(enable);
345 347  
346 348 List<Roles> roles = rolesService.queryRoles(rolesQuery);
347 349 List<Permissions> permissionses = null;
... ... @@ -383,7 +385,8 @@
383 385 public FrontEndResult getAdminList(HttpServletResponse response,
384 386 @RequestParam(value = "keyword",required = false) String keyword,
385 387 @RequestParam(value = "page",required = false) Integer page,
386   - @RequestParam(value = "limit",required = false) Integer limit) {
  388 + @RequestParam(value = "limit",required = false) Integer limit,
  389 + @RequestParam(value = "enable",required = false) Integer enable) {
387 390  
388 391 limit = limit == null ? 10 : limit;
389 392 page = page == null ? 1 : page;
... ... @@ -396,6 +399,7 @@
396 399 rolesQuery.setKeyword(keyword);
397 400 rolesQuery.setPage(page);
398 401 rolesQuery.setLimit(limit);
  402 + rolesQuery.setEnable(enable);
399 403  
400 404 List<Roles> roles = rolesService.queryRoles(rolesQuery);
401 405