From 5a548beccca66296b162cfc2ec66da7145910550 Mon Sep 17 00:00:00 2001
From: Xu Huisheng <xyz20003@gmail.com>
Date: Tue, 14 Aug 2018 13:33:20 +0800
Subject: [PATCH] =?UTF-8?q?#170=20=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84?=
 =?UTF-8?q?=EF=BC=8C=E6=97=A0=E6=B3=95=E8=AE=BE=E7=BD=AE=E5=B2=97=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mossle/party/web/OrgController.java  | 15 ++++++++-------
 webapp/content/party/org-list.jsp                 |  2 +-
 webapp/content/party/org-position-input.jsp       |  4 ++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/mossle/party/web/OrgController.java b/src/main/java/com/mossle/party/web/OrgController.java
index cb05038fc..f20d0dae9 100644
--- a/src/main/java/com/mossle/party/web/OrgController.java
+++ b/src/main/java/com/mossle/party/web/OrgController.java
@@ -5,7 +5,8 @@
 import javax.annotation.Resource;
 
 import com.mossle.api.tenant.TenantHolder;
-import com.mossle.api.user.UserConnector;
+
+import com.mossle.client.user.UserClient;
 
 import com.mossle.core.mapper.BeanMapper;
 import com.mossle.core.page.Page;
@@ -45,7 +46,7 @@ public class OrgController {
     private PartyTypeManager partyTypeManager;
     private PartyStructManager partyStructManager;
     private PartyStructTypeManager partyStructTypeManager;
-    private UserConnector userConnector;
+    private UserClient userClient;
     private PartyService partyService;
     private BeanMapper beanMapper = new BeanMapper();
     private TenantHolder tenantHolder;
@@ -409,14 +410,14 @@ public String orgAdminSave(
     public String orgPositionInput(
             Model model,
             @RequestParam(value = "partyStructTypeId", required = false) Long partyStructTypeId,
-            @RequestParam(value = "partyTypeId", required = false) Long partyTypeId,
+            @RequestParam(value = "partyTypeType", required = false) Integer partyTypeType,
             @RequestParam(value = "partyEntityId", required = false) Long partyEntityId)
             throws Exception {
         partyStructTypeId = 1L;
 
         PartyEntity partyEntity = this.init(model, partyStructTypeId,
                 partyEntityId);
-        PartyType partyType = partyTypeManager.get(partyTypeId);
+        PartyType partyType = partyTypeManager.findUniqueBy("type", partyTypeType);
 
         model.addAttribute("partyEntity", partyEntity);
         model.addAttribute("partyType", partyType);
@@ -440,7 +441,7 @@ public String orgPositionSave(
         PartyType partyType = partyTypeManager.get(partyTypeId);
 
         // 岗位人员是5
-        PartyStructType partyStructType = partyStructTypeManager.get(5L);
+        PartyStructType partyStructType = partyStructTypeManager.findUniqueBy("type", "user-position");
 
         if (partyType.getType() == TYPE_POSITION) {
             // 岗位
@@ -509,8 +510,8 @@ public void setPartyStructTypeManager(
     }
 
     @Resource
-    public void setUserConnector(UserConnector userConnector) {
-        this.userConnector = userConnector;
+    public void setUserClient(UserClient userClient) {
+        this.userClient = userClient;
     }
 
     @Resource
diff --git a/webapp/content/party/org-list.jsp b/webapp/content/party/org-list.jsp
index e6a21aec1..8b79c29ec 100644
--- a/webapp/content/party/org-list.jsp
+++ b/webapp/content/party/org-list.jsp
@@ -142,7 +142,7 @@ $(function() {
         <td>
 		  <a href="org-remove.do?selectedItem=${item.id}&partyStructTypeId=${partyStructTypeId}&partyEntityId=${partyEntityId}" class="a-remove">删除</a>
 		  <c:if test="${item.childEntity.partyType.type==1}">
-		    <a href="org-position-input.do?partyStructTypeId=${partyStructTypeId}&partyEntityId=${item.childEntity.id}&partyTypeId=5" class="a-remove">配置职位</a>
+		    <a href="org-position-input.do?partyStructTypeId=${partyStructTypeId}&partyEntityId=${item.childEntity.id}&partyTypeType=2" class="a-remove">配置职位</a>
 		  </c:if>
 		</td>
       </tr>
diff --git a/webapp/content/party/org-position-input.jsp b/webapp/content/party/org-position-input.jsp
index 30f50f38f..cb05555ec 100644
--- a/webapp/content/party/org-position-input.jsp
+++ b/webapp/content/party/org-position-input.jsp
@@ -22,8 +22,8 @@ $(function() {
 })
     </script>
 
-    <link type="text/css" rel="stylesheet" href="${cdnPrefix}/userpicker3/userpicker.css">
-    <script type="text/javascript" src="${cdnPrefix}/userpicker3/userpicker.js"></script>
+    <link type="text/css" rel="stylesheet" href="${cdnPrefix}/public/mossle-userpicker/3.0/userpicker.css">
+    <script type="text/javascript" src="${cdnPrefix}/public/mossle-userpicker/3.0/userpicker.js"></script>
 	<script type="text/javascript">
 $(function() {
 	createUserPicker({