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

dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java

@@ -579,7 +579,7 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService {
         infoMap.put("date", startTime + "~" + endTime);
 
         //不是空的话查看是对应各局的
-        List<RemoteAiLabelPostVo> postVoList = remoteLablePostService.selectLabelByList(businessAlertBo.getPostCode(), LoginHelper.getDeptId());
+        List<RemoteAiLabelPostVo> postVoList = remoteLablePostService.selectLabelByList(businessAlertBo.getPostCode(), null);
 
         Map<String, List<RemoteAiLabelPostVo>> aiNameMap = postVoList.stream().collect(Collectors.groupingBy(RemoteAiLabelPostVo::getAiName));
 
@@ -637,7 +637,7 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService {
         Map<String,Object> infoMap =  new HashMap<>();
 
         //不是空的话查看是对应各局的
-        List<RemoteAiLabelPostVo> postVoList = remoteLablePostService.selectLabelByList(businessAlertBo.getPostCode(), LoginHelper.getDeptId());
+        List<RemoteAiLabelPostVo> postVoList = remoteLablePostService.selectLabelByList(businessAlertBo.getPostCode(), null);
 
         Map<String, List<RemoteAiLabelPostVo>> aiNameMap = postVoList.stream().collect(Collectors.groupingBy(RemoteAiLabelPostVo::getAiName));
 

dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java

@@ -687,7 +687,7 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist
         //构建查询数据权限
         createPermissions(businessAlertBo);
 
-        List<RemoteAiLabelPostVo> postVoList = remoteLabelPostService.selectLabelByList(businessAlertBo.getPostCode(), LoginHelper.getDeptId());
+        List<RemoteAiLabelPostVo> postVoList = remoteLabelPostService.selectLabelByList(businessAlertBo.getPostCode(), null);
 
         Map<String, List<RemoteAiLabelPostVo>> aiNameMap = postVoList.stream().collect(Collectors.groupingBy(RemoteAiLabelPostVo::getAiName));