From 4f90ef54fe92f54f5013d4147eb7859b4c676b79 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 30 Jul 2020 19:22:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=BC=93=E5=AD=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/UserBaseInfoDao.java  | 10 ++++++++++
 .../epmet/service/impl/UserBaseInfoServiceImpl.java   |  6 +++---
 .../src/main/resources/mapper/UserBaseInfoDao.xml     | 11 +++++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBaseInfoDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBaseInfoDao.java
index 5bafec9228..6f219d961f 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBaseInfoDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBaseInfoDao.java
@@ -71,4 +71,14 @@ public interface UserBaseInfoDao extends BaseDao<UserBaseInfoEntity> {
      * @date 2020.07.30 14:01
     **/
     void updateWithoutCover(UserBaseInfoEntity entity);
+
+
+    /**
+     * @Description 根据UserId查询是否存在基础信息
+     * @param userId
+     * @return ID   主键
+     * @author wangc
+     * @date 2020.07.30 19:16
+     **/
+    String selectIdByUserId(@Param("userId") String userId);
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
index 1ab351a962..3f2ffbdcea 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
@@ -218,13 +218,13 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
         if(StringUtils.isBlank(baseInfo.getUserId())){
             return ;
         }
-        UserBaseInfoResultDTO userBaseInfoResultDTO = baseDao.selectListByUserIdList(baseInfo.getUserId());
+        String id = baseDao.selectIdByUserId(baseInfo.getUserId());
         if(StringUtils.isNotBlank(baseInfo.getSurname())) {
             baseInfo.setRealName(new StringBuilder(baseInfo.getSurname()).append(baseInfo.getName()).toString());
         }
-        if(null != userBaseInfoResultDTO && StringUtils.isNotBlank(userBaseInfoResultDTO.getId())){
+        if(StringUtils.isNotBlank(id)){
             //更新
-            baseInfo.setId(userBaseInfoResultDTO.getId());
+            baseInfo.setId(id);
             baseDao.updateWithoutCover(baseInfo);
         }else{
             //新增
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml
index e7ff160d6d..828d06aebd 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml
@@ -113,4 +113,15 @@
         </set>
         WHERE id = #{id}
     </update>
+
+
+
+    <!-- 根据用户id，查询用户基础信息-->
+    <select id="selectIdByUserId" resultType="string">
+       SELECT
+          ID
+        FROM user_base_info
+        WHERE DEL_FLAG = '0'
+        AND USER_ID = #{userId}
+    </select>
 </mapper>