Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/service/impl/MonitorServiceImpl.java

@@ -360,22 +360,25 @@ public class MonitorServiceImpl implements MonitorService {
                     idList.add(companyId);
                 }
             }
-            //去除重复企业id
-            idList = idList.stream().distinct().collect(Collectors.toList());
             RedisUtils.setCacheList("monitorCompanyList",idList);
             //设置过期时间两天
             RedisUtils.expire("monitorCompanyList",172800);
         }
+        //去除重复企业id
+        idList = idList.stream().distinct().collect(Collectors.toList());
         log.info("获取供应商企业id数量："+idList.size());
 
         PushMonitorCompanyAddVo addVo = new PushMonitorCompanyAddVo();
+        Long userId = LoginHelper.getUserId();
+        if (ObjectUtil.isNotEmpty(userId)) {
+            addVo.setUserId(userId);
+        }
         addVo.setSystemCode("ZJYJ");
         int size = idList.size();
         if (size<=200){
             addVo.setCid(idList);
             log.info("中建一局用户添加默认监控企业！");
             Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/company/addDefaultCompany", BeanUtil.beanToMap(addVo, false, false));
-            log.info("addDefaultCompany  返回值map====================》"+map.toString());
         }else {
             //循环次数
             int num =  (size+(200-1))/200;
@@ -390,7 +393,6 @@ public class MonitorServiceImpl implements MonitorService {
                 addVo.setCid(newList);
                 log.info("中建一局用户添加默认监控企业------->循环添加："+i*200+"----"+(i+1)*200);
                 Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/company/addDefaultCompany", BeanUtil.beanToMap(addVo, false, false));
-                log.info("addDefaultCompany  循环添加返回值map====================》"+map.toString());
             }
         }
         return R.ok("默认企业添加中，请稍候");