Merge remote-tracking branch 'origin/dev_ic_data' into dev_ic_data

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java

@@ -113,8 +113,9 @@ public class GovProjectController {
 	 * @author sun
 	 */
 	@PostMapping("projectanalysis")
-	public Result<ProjectAnalysisResultDTO> projectAnalysis(@RequestBody ProjectAnalysisFormDTO formDTO) {
+	public Result<ProjectAnalysisResultDTO> projectAnalysis(@LoginUser TokenDto tokenDto, @RequestBody ProjectAnalysisFormDTO formDTO) {
 		ValidatorUtils.validateEntity(formDTO, ProjectAnalysisFormDTO.Analysis.class);
+		formDTO.setCustomerId(tokenDto.getCustomerId());
 		return new Result<ProjectAnalysisResultDTO>().ok(govProjectService.projectAnalysis(formDTO));
 	}
 

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);
+    List<UserBaseInfoDTO> getUserBaseList(@Param("userId") String userId, @Param("customerId") String customerId);
 }

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

@@ -154,7 +154,7 @@ public interface EpmetUserService {
      * @Description 查询userId的身份证号在小程序用户中存在的多个userId值
      * @author sun
      */
-    List<UserBaseInfoDTO> getUserBaseList(String userId);
+    List<UserBaseInfoDTO> getUserBaseList(String userId, String customerId);
 
     /**
      * @Description 根据身份证号查询负能平台用户信息

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

@@ -712,8 +712,8 @@ public class EpmetUserServiceImpl implements EpmetUserService {
      * @author sun
      */
     @Override
-    public List<UserBaseInfoDTO> getUserBaseList(String userId) {
+    public List<UserBaseInfoDTO> getUserBaseList(String userId, String customerId) {
-        return userBaseInfoDao.getUserBaseList(userId);
+        return userBaseInfoDao.getUserBaseList(userId, customerId);
     }
 
     /**

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java

@@ -480,7 +480,7 @@ public class GovProjectServiceImpl implements GovProjectService {
 		ProjectAnalysisResultDTO resultDTO = new ProjectAnalysisResultDTO();
 		resultDTO.setUserId(formDTO.getUserId());
 		//1.查询userId的身份证号在小程序用户中存在的多个userId值
-		List<UserBaseInfoDTO> userList = epmetUserService.getUserBaseList(formDTO.getUserId());
+		List<UserBaseInfoDTO> userList = epmetUserService.getUserBaseList(formDTO.getUserId(), formDTO.getCustomerId());
 		List<String> userIds = userList.stream().map(UserBaseInfoDTO::getUserId).collect(Collectors.toList());
 
 		//2.查询对应负能平台用户家庭信息

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

@@ -47,6 +47,7 @@
         WHERE
             del_flag = '0'
         AND id_num = ( SELECT id_num FROM user_base_info WHERE user_id = #{userId})
+        AND customer_id = #{customerId}
     </select>
 
 </mapper>