15928045575 há 2 anos atrás
pai
commit
b93ff45563

+ 1 - 1
slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/controller/ProjectController.java

@@ -148,7 +148,7 @@ public class ProjectController {
     //@RepeatSubmit(interval = 3000, message = "两次请求间隔未超过3秒")
     @RequestMapping(name = "查询所有项目", value = "/selectAll", method = RequestMethod.GET)
     public HttpResult selectAll(HttpServletRequest request) {
-        return projectService.selectAll();
+        return projectService.selectAll(request);
     }
 
     @Log(description = "数据总览")

+ 6 - 2
slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/service/ProjectService.java

@@ -1336,8 +1336,12 @@ public class ProjectService {
         return HttpResult.ok("删除关联设备成功!");
     }
 
-    public HttpResult selectAll() {
-        List<KwsProject> kwsProjects = projectMapper.selectList(new LambdaQueryWrapper<KwsProject>().eq(KwsProject::getDelFlag, 0));
+    public HttpResult selectAll(HttpServletRequest request) {
+        HeaderData headerData = commonService.getHeaderData(request);
+        List<KwsProject> kwsProjects = projectMapper.selectList(new LambdaQueryWrapper<KwsProject>()
+                .eq(KwsProject::getDelFlag, 0)
+                .eq(org.apache.commons.lang3.StringUtils.isNotBlank(headerData.getCompanyId()), KwsProject::getCompanyId, headerData.getCompanyId())
+        );
         Map<Long, String> projectMap = new HashMap<>();
         if (!CollectionUtils.isEmpty(kwsProjects)) {
             projectMap = kwsProjects.stream().collect(Collectors.toMap(KwsProject::getId, KwsProject::getName));