Merge branch 'feature-2023-01-目标配置' into 'developer'

目标跟进接口修复

See merge request !923

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/target/TargetController.java

@@ -56,7 +56,6 @@ public class TargetController {
         param.setEnterpriseId(qo.getEnterpriseId());
         param.setReleaseFlag(1);
         param.setTargetYear(qo.getTime().substring(0,4));
-        param.setStoreId("-1");
         ServiceResponse<Page<NewDataTargetConfigDTO>> res = newDataTargetConfigApiService.queryNewDataTargetConfig(param, new BasePageInfo());
         if (res.isSuccess()) {
             if (res.getResult().getTotalCount() > 0) {
@@ -91,8 +90,9 @@ public class TargetController {
         }
         result1.putAll(result2);
 
-        List<String> keyList = TargetAnalysisUtils.map.get("1");
+        List<String> keyList = new ArrayList<>();
         keyList.addAll(TargetAnalysisUtils.map.get("0"));
+        keyList.addAll(TargetAnalysisUtils.map.get("1"));
         keyList.addAll(TargetAnalysisUtils.map.get("2"));
         keyList.addAll(TargetAnalysisUtils.map.get("3"));
         keyList.addAll(TargetAnalysisUtils.map.get("4"));