From 61751c5d91440b938abec5cacc44d128dca35c17 Mon Sep 17 00:00:00 2001
From: zhangrui <zhangrui@lymsh.com>
Date: Thu, 8 Sep 2016 19:44:17 +0800
Subject: [PATCH]           bug fix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

管理员默认机构
---
 .../com/lyms/platform/operate/web/controller/UsersController.java   | 6 +++---
 platform-operate-api/src/main/resources/database.properties         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

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 c8b59ec..4a2b135 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
@@ -57,8 +57,8 @@ public class UsersController extends BaseController {
     private String typeId;
     @Value("#{configProperties['login.defaultPwd']}")
     private String defaultPwd;
-    @Value("#{configProperties['admin.default_org_id']}")
-    private Integer default_admin_org_id;
+    @Value("#{configProperties['default_admin_org_id']}")
+    private String default_admin_org_id;
     @Autowired
     private RolePermissionMapsService rolePermissionMapsService;
     @Autowired
@@ -579,7 +579,7 @@ public class UsersController extends BaseController {
             Users users = new Users();
             users.setType(UserTypeEnum.PLATFORM_ADMIN.getId());
             users.setName(name);
-            user.setOrgId(default_admin_org_id);
+            user.setOrgId(Integer.parseInt(default_admin_org_id));
             users.setAccount(account);
             users.setPhone(phone);
             users.setEnable(enable);
diff --git a/platform-operate-api/src/main/resources/database.properties b/platform-operate-api/src/main/resources/database.properties
index 9882c85..6eaf67b 100644
--- a/platform-operate-api/src/main/resources/database.properties
+++ b/platform-operate-api/src/main/resources/database.properties
@@ -58,4 +58,4 @@ report.initialpoolsize=2
 report.minpoolsize=2
 
 #添加管理员默认所属机构
-admin.default_org_id=203
\ No newline at end of file
+default_admin_org_id=203
\ No newline at end of file
-- 
1.8.3.1