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

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckListFormDTO.java

@@ -33,5 +33,8 @@ public class TDuckListFormDTO implements Serializable {
     @NotBlank(message = "orgIds不能为空",groups = TDuckListForm.class)
     private String orgIds;
 
+    @NotBlank(message = "client不能为空",groups = TDuckListForm.class)
+    private String client;
+
     private String userId;
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java

@@ -63,5 +63,5 @@ public interface PrUserProjectDao extends BaseDao<PrUserProjectEntity> {
      * @author zxc
      * @date 2021/9/17 3:41 下午
      */
-    List<TDuckListResultDTO> queryProjectList(@Param("keys")List<String> keys, @Param("status")Integer status);
+    List<TDuckListResultDTO> queryProjectList(@Param("keys")List<String> keys, @Param("status")Integer status,@Param("client")String client);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java

@@ -144,7 +144,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
         if (CollectionUtils.isEmpty(projectKeys)){
             return new ArrayList<>();
         }
-        PageInfo<TDuckListResultDTO> projectPageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.queryProjectList(projectKeys, formDTO.getStatus()));
+        PageInfo<TDuckListResultDTO> projectPageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.queryProjectList(projectKeys, formDTO.getStatus(), formDTO.getClient()));
         List<TDuckListResultDTO> result = projectPageInfo.getList();
         List<String> records = visitRecordDao.selectVisitRecordByUserId(formDTO.getUserId());
         if (!CollectionUtils.isEmpty(records)){

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml

@@ -62,6 +62,7 @@
         select * from pr_user_project
         where del_flag = 0
         AND status = #{status}
+        AND client = #{client}
         AND `key` in (
             <foreach collection="keys" item="key" separator=",">
                 #{key}