Merge remote-tracking branch 'origin/dev_heart' into dev

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBaseInfoDao.java

@@ -70,4 +70,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);
 }

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{
             //新增

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>