From 2ecf2ae8da9bae2ec9e03bb71936fab614fa76cf Mon Sep 17 00:00:00 2001
From: "rui.zhang" <zhangrui@lymsh.com>
Date: Thu, 14 Apr 2016 10:46:12 +0800
Subject: [PATCH] platform permission add paging

---
 .../main/java/com/lyms/platform/permission/model/Users.java | 13 +++++++++++--
 .../platform/operate/web/controller/UsersController.java    | 12 ++++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java
index 6787eba..50fe91e 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java
@@ -7,8 +7,9 @@ public class Users {
     private Integer id;
     private Integer logincenterId;
     private Integer type;
-    private Integer orgId;
-    private Integer deptId;
+    private Integer orgId;  //机构ID
+    private Integer deptId; //部门ID
+    private Integer ksId; //科室ID
     private String name;
     private String account;
     private String pwd;
@@ -28,6 +29,14 @@ public class Users {
     private Organization organization;
 
 
+    public Integer getKsId() {
+        return ksId;
+    }
+
+    public void setKsId(Integer ksId) {
+        this.ksId = ksId;
+    }
+
     public Departments getDepartmentses() {
         return departmentses;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
index 50f316d..889f501 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
@@ -445,7 +445,8 @@ public class UsersController extends BaseController {
     public void addUsers(HttpServletResponse response,
                          HttpServletRequest request,
                          @RequestParam(value = "deptId") Integer deptId,
-                         @RequestParam(value = "orgId") Integer orgId,
+                         @RequestParam(value = "orgId", required = false) Integer orgId,
+                         @RequestParam(value = "ksId", required = false) Integer ksId,
                          @RequestParam(value = "name", required = false) String name,
                          @RequestParam(value = "account", required = false)String account,
                          @RequestParam(value = "phone") String phone,
@@ -459,13 +460,15 @@ public class UsersController extends BaseController {
         Users user = usersService.getUsersByLoginCenterId(loginState.getId());
 
         Departments departments = departmentsService.getDepartments(deptId);
-        Organization organization = organizationService.getOrganization(orgId);
 
-        if ( StringUtils.isBlank(roleIds) || deptId == null ||
-                StringUtils.isBlank(name) || StringUtils.isBlank(phone) || null == user || null == departments || null == organization) {
+        if ( StringUtils.isBlank(roleIds) ||  StringUtils.isBlank(name) || StringUtils.isBlank(phone) || null == user || null == departments ) {
             ResultUtils.buildParameterErrorResultAndWrite(response);
             return;
         }
+        if(deptId == null && ksId == null) {
+            ResultUtils.buildParameterErrorResultAndWrite(response, "deptId or ksId required");
+            return;
+        }
 
         if (user != null) {
 
@@ -491,6 +494,7 @@ public class UsersController extends BaseController {
             users.setPhone(phone);
             users.setEnable(enable);
             users.setRemarks(remarks);
+            users.setKsId(ksId);
             users.setPublishId(user.getId());
             users.setPublishName(user.getName());
             users.setYn(YnEnums.YES.getId());
-- 
1.8.3.1