shiyang / regional-platform

Download as
Browse Code ยป

Commit 928995d28d09ea56153cafc578cd435e48b62e08

Authored by jiangjiazhi
2 parents 22a0f4b2b6 d0ecec77ae
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 1 changed file

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java View file @ 928995d
... ... @@ -463,8 +463,8 @@
463 463 @TokenRequired
464 464 public void addUsers(HttpServletResponse response,
465 465 HttpServletRequest request,
466   - @RequestParam(value = "deptId") Integer deptId,
467   - @RequestParam(value = "orgId", required = false) Integer orgId,
  466 + @RequestParam(value = "orgId") Integer orgId,
  467 + @RequestParam(value = "deptId", required = false) Integer deptId,
468 468 @RequestParam(value = "ksId", required = false) Integer ksId,
469 469 @RequestParam(value = "name", required = false) String name,
470 470 @RequestParam(value = "account", required = false)String account,
471 471  
... ... @@ -478,9 +478,8 @@
478 478 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
479 479 Users user = usersService.getUsers(loginState.getId());
480 480  
481   - Departments departments = departmentsService.getDepartments(deptId);
482 481  
483   - if ( StringUtils.isBlank(roleIds) || StringUtils.isBlank(phone) || null == user || null == departments ) {
  482 + if ( StringUtils.isBlank(roleIds) || StringUtils.isBlank(phone) || null == user ) {
484 483 ResultUtils.buildParameterErrorResultAndWrite(response);
485 484 return;
486 485 }