From e692ae775d39ea569cec5ceeb34ad2149d32369b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 29 Dec 2019 22:38:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=94=A8=E6=88=B7=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=B3=A8=E5=86=8C=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsh/erp/service/user/UserService.java | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/jsh/erp/service/user/UserService.java b/src/main/java/com/jsh/erp/service/user/UserService.java
index dddef5c9..de86f7db 100644
--- a/src/main/java/com/jsh/erp/service/user/UserService.java
+++ b/src/main/java/com/jsh/erp/service/user/UserService.java
@@ -307,6 +307,23 @@ public class UserService {
         }
         return list;
     }
+
+    /**
+     * 根据用户名查询id
+     * @param loginName
+     * @return
+     */
+    public Long getIdByLoginName(String loginName) {
+        Long userId = 0L;
+        UserExample example = new UserExample();
+        example.createCriteria().andLoginameEqualTo(loginName);
+        List<User> list = userMapper.selectByExample(example);
+        if(list!=null) {
+            userId = list.get(0).getId();
+        }
+        return userId;
+    }
+
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
     public void addUserAndOrgUserRel(UserEx ue) throws Exception{
         if(BusinessConstants.DEFAULT_MANAGER.equals(ue.getLoginame())) {
@@ -335,13 +352,8 @@ public class UserService {
             //机构id
             oul.setOrgaId(ue.getOrgaId());
             //用户id，根据用户名查询id
-            UserExample example = new UserExample();
-            example.createCriteria().andLoginameEqualTo(ue.getLoginame());
-            List<User> list = userMapper.selectByExample(example);
-            if(list!=null) {
-                Long userId = list.get(0).getId();
-                oul.setUserId(userId);
-            }
+            Long userId = getIdByLoginName(ue.getLoginame());
+            oul.setUserId(userId);
             //用户在机构中的排序
             oul.setUserBlngOrgaDsplSeq(ue.getUserBlngOrgaDsplSeq());
 
@@ -403,6 +415,8 @@ public class UserService {
             int result=0;
             try{
                 result= userMapper.insertSelective(ue);
+                Long userId = getIdByLoginName(ue.getLoginame());
+                ue.setId(userId);
             }catch(Exception e){
                 JshException.writeFail(logger, e);
             }