shiyang / regional-platform

Download as
Browse Code »

Commit 2ecf2ae8da9bae2ec9e03bb71936fab614fa76cf

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

platform permission 

add paging

Showing 2 changed files with 19 additions and 6 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java View file @ 2ecf2ae
... ... @@ -7,8 +7,9 @@
7 7 private Integer id;
8 8 private Integer logincenterId;
9 9 private Integer type;
10   - private Integer orgId;
11   - private Integer deptId;
  10 + private Integer orgId; //»ú¹¹ID
  11 + private Integer deptId; //²¿ÃÅID
  12 + private Integer ksId; //¿ÆÊÒID
12 13 private String name;
13 14 private String account;
14 15 private String pwd;
... ... @@ -27,6 +28,14 @@
27 28 private Departments departmentses;
28 29 private Organization organization;
29 30  
  31 +
  32 + public Integer getKsId() {
  33 + return ksId;
  34 + }
  35 +
  36 + public void setKsId(Integer ksId) {
  37 + this.ksId = ksId;
  38 + }
30 39  
31 40 public Departments getDepartmentses() {
32 41 return departmentses;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java View file @ 2ecf2ae
... ... @@ -445,7 +445,8 @@
445 445 public void addUsers(HttpServletResponse response,
446 446 HttpServletRequest request,
447 447 @RequestParam(value = "deptId") Integer deptId,
448   - @RequestParam(value = "orgId") Integer orgId,
  448 + @RequestParam(value = "orgId", required = false) Integer orgId,
  449 + @RequestParam(value = "ksId", required = false) Integer ksId,
449 450 @RequestParam(value = "name", required = false) String name,
450 451 @RequestParam(value = "account", required = false)String account,
451 452 @RequestParam(value = "phone") String phone,
452 453  
453 454  
... ... @@ -459,13 +460,15 @@
459 460 Users user = usersService.getUsersByLoginCenterId(loginState.getId());
460 461  
461 462 Departments departments = departmentsService.getDepartments(deptId);
462   - Organization organization = organizationService.getOrganization(orgId);
463 463  
464   - if ( StringUtils.isBlank(roleIds) || deptId == null ||
465   - StringUtils.isBlank(name) || StringUtils.isBlank(phone) || null == user || null == departments || null == organization) {
  464 + if ( StringUtils.isBlank(roleIds) || StringUtils.isBlank(name) || StringUtils.isBlank(phone) || null == user || null == departments ) {
466 465 ResultUtils.buildParameterErrorResultAndWrite(response);
467 466 return;
468 467 }
  468 + if(deptId == null && ksId == null) {
  469 + ResultUtils.buildParameterErrorResultAndWrite(response, "deptId or ksId required");
  470 + return;
  471 + }
469 472  
470 473 if (user != null) {
471 474  
... ... @@ -491,6 +494,7 @@
491 494 users.setPhone(phone);
492 495 users.setEnable(enable);
493 496 users.setRemarks(remarks);
  497 + users.setKsId(ksId);
494 498 users.setPublishId(user.getId());
495 499 users.setPublishName(user.getName());
496 500 users.setYn(YnEnums.YES.getId());