bug修改

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/UserBaseInfoDao.java

@@ -55,5 +55,5 @@ public interface UserBaseInfoDao extends BaseDao<UserBaseInfoEntity> {
      * @Description 查询userId的身份证号在小程序用户中存在的多个userId值
      * @author sun
      */
-    List<UserBaseInfoDTO> getUserBaseList(@Param("userId") String userId, @Param("customerId") String customerId);
+    List<UserBaseInfoDTO> getUserBaseList(@Param("customerId") String customerId, @Param("userId") String userId, @Param("idCard") String idCard);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -27,11 +27,8 @@ import com.epmet.dataaggre.dto.govorg.result.GridStaffResultDTO;
 import com.epmet.dataaggre.dto.govorg.result.StaffOrgNameResultDTO;
 import com.epmet.dataaggre.dto.govorg.result.StaffOrgRelationResultDTO;
 import com.epmet.dataaggre.dto.govproject.result.ProjectAnalysisResultDTO;
-import com.epmet.dataaggre.entity.epmetuser.CustomerStaffEntity;
+import com.epmet.dataaggre.entity.epmetuser.*;
-import com.epmet.dataaggre.entity.epmetuser.GovStaffRoleEntity;
-import com.epmet.dataaggre.entity.epmetuser.ResiUserBadgeEntity;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
-import com.epmet.dataaggre.entity.epmetuser.StaffRoleEntity;
 import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
 import com.epmet.dataaggre.service.epmetuser.StaffPatrolDetailService;
 import com.epmet.dataaggre.service.epmetuser.StaffPatrolRecordService;
@@ -714,7 +711,13 @@ public class EpmetUserServiceImpl implements EpmetUserService {
      */
     @Override
     public List<UserBaseInfoDTO> getUserBaseList(String userId, String customerId) {
-        return userBaseInfoDao.getUserBaseList(userId, customerId);
+        List<UserBaseInfoDTO> resultList = new ArrayList<>();
+        List<UserBaseInfoDTO> list = userBaseInfoDao.getUserBaseList(customerId, userId, null);
+        if (!CollectionUtils.isEmpty(list) && StringUtils.isNotBlank(list.get(0).getIdNum())) {
+            return userBaseInfoDao.getUserBaseList(customerId, null, list.get(0).getIdNum());
+        }
+        resultList.addAll(list);
+        return resultList;
     }
 
     /**

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml

@@ -41,13 +41,24 @@
 
     <select id="getUserBaseList" resultType="com.epmet.dto.UserBaseInfoDTO">
         SELECT
-            *
+            customer_id,
+            user_id,
+            mobile,
+            real_name,
+            id_num,
+            gender,
+            head_img_url
         FROM
             user_base_info
         WHERE
             del_flag = '0'
-        AND id_num = ( SELECT id_num FROM user_base_info WHERE user_id = #{userId})
         AND customer_id = #{customerId}
+        <if test='userId != "" and userId != null'>
+            AND user_id = #{userId}
+        </if>
+        <if test='idCard != "" and idCard != null'>
+            AND id_num = #{idCard}
+        </if>
     </select>
 
 </mapper>