From 6adfb8fe6d391a3329f146abb75463d5d8cff35b Mon Sep 17 00:00:00 2001
From: hanshaofeng <hanshaofeng@lymsh.com>
Date: Thu, 24 Nov 2016 10:57:24 +0800
Subject: [PATCH] permission2

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

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 3a023b0..2aa7b5f 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
@@ -67,6 +67,19 @@ public class Users {
     private String foreignId;
 
     private String roleStr;
+    /*
+    多个区域，省市区乡 如果为0代表全部，省不可为0
+    [{"p":"1","c":"2","a":"3","s":"4"},{"p":"2","c":"0","a":"0","s":"0"}]
+    */
+    private String areaPermission;
+
+    public String getAreaPermission() {
+        return areaPermission;
+    }
+
+    public void setAreaPermission(String areaPermission) {
+        this.areaPermission = areaPermission;
+    }
 
     public String getRoleStr() {
         return roleStr;
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 ee16153..5483d42 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
@@ -108,6 +108,9 @@ public class UsersController extends BaseController {
             user.setDepartmentses(departmentsService.getDepartments(user.getDeptId()));
             List<DataPermissionsModel> permissionsModelList = accessPermissionFacade.findAccessPerminssionByUserId(user.getId());
             user.setOrganizations(accessPermissionFacade.getOrganization(permissionsModelList));
+            if (permissionsModelList != null && permissionsModelList.size() > 0) {
+                user.setAreaPermission(permissionsModelList.get(0).getAreaPermission());
+            }
         }
 
         FrontEndResult frontEndResult = new FrontEndResult();
@@ -206,6 +209,11 @@ public class UsersController extends BaseController {
             if(null!=user.getZhiChenId()){
                 user.setZhiChen(ZhiChenEnums.getById(user.getZhiChenId()));
             }
+            List<DataPermissionsModel> permissionsModelList = accessPermissionFacade.findAccessPerminssionByUserId(user.getId());
+            user.setOrganizations(accessPermissionFacade.getOrganization(permissionsModelList));
+            if (permissionsModelList != null && permissionsModelList.size() > 0) {
+                user.setAreaPermission(permissionsModelList.get(0).getAreaPermission());
+            }
 //            user.setPwd(StringUtils.isEmpty(user.getPwd())?user.getPwd():user.getPwd().replaceAll(".","*"));
             user.setPwd(replacePwd);
         }
-- 
1.8.3.1