From 322acd604fff29df4ae07ee1fbd2d331c2b32ade Mon Sep 17 00:00:00 2001
From: "rui.zhang" <zhangrui@lymsh.com>
Date: Fri, 29 Apr 2016 17:48:24 +0800
Subject: [PATCH] platform permission        add return pageinfo

---
 .../main/java/com/lyms/platform/permission/model/Users.java  |  2 +-
 .../main/java/com/lyms/platform/pojo/CommunityConfig.java    |  2 +-
 .../platform/operate/web/controller/UsersController.java     | 12 ++++++++----
 3 files changed, 10 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 1062c0d..960145a 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
@@ -17,7 +17,7 @@ public class Users {
     private Integer publishId;
     private String publishName;
     private Integer yn;
-    private Integer enable;
+    private Integer enable; // 1启用 2禁用
     private Date modified;
     private Date created;
     private String remarks;
diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CommunityConfig.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CommunityConfig.java
index dd43d7c..8ec4c18 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/CommunityConfig.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CommunityConfig.java
@@ -12,7 +12,7 @@ public class CommunityConfig {
     private String name;
     private String parentId;
     private Integer yn;
-    private Integer type;   //1 地名, 2 小区
+    private Integer type;   //1 地名, 2 社区
     private CommunityConfig parent;
     private List<CommunityConfig> nodes;
     private String gxxq;    //管辖小区
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 1e9939e..9b6ac79 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
@@ -110,7 +110,7 @@ public class UsersController extends BaseController {
                                @RequestParam(value = "page", required = false) Integer page,
                                @RequestParam(value = "limit", required = false) Integer limit,
                                @RequestParam(value = "orgId", required = false) Integer orgId,
-                               @RequestParam(value = "ksId", required = false) Integer ksId) {
+                               @RequestParam(value = "deptId", required = false) Integer deptId) {
 
         limit = limit == null ? 10 : limit;
         page = page == null ? 1 : page;
@@ -119,7 +119,7 @@ public class UsersController extends BaseController {
         usersQuery.setNeed("true");
         usersQuery.setSort("id desc");
         usersQuery.setYn(YnEnums.YES.getId());
-        usersQuery.setKsId(ksId);
+        usersQuery.setDeptId(deptId);
         usersQuery.setKeyword(keyword);
         usersQuery.setType(1);
         usersQuery.setOrgId(orgId);
@@ -216,12 +216,16 @@ public class UsersController extends BaseController {
         UsersQuery usersQuery = new UsersQuery();
         usersQuery.setPhone(phone);
         usersQuery.setYn(YnEnums.YES.getId());
-        int count = usersService.queryUsersCount(usersQuery);
-        if(0 == count) {
+        List<Users> list = usersService.queryUsers(usersQuery);
+        if(0 == list.size()) {
             ResultUtils.buildParameterErrorResultAndWrite(httpServletResponse, "该账户不存在");
             return;
         }
 
+        if(list.get(0).getEnable().equals(2)) {
+            ResultUtils.buildParameterErrorResultAndWrite(httpServletResponse, "该账户已被禁用");
+            return;
+        }
 
         LoginContext loginContext = LoginUtil.sendVerCode(phone, typeId, token);
         if(null != loginContext) {
-- 
1.8.3.1