fix(user): 修复部门层级查找逻辑

- 当找不到parentId=100的部门时，返回当前部门id作为默认值 - 修改顶级部门查找逻辑，返回顶级部门ID而不是null - 避免因返回null导致的空指针异常问题

fix(user): 修复部门层级查找逻辑
- 当找不到parentId=100的部门时，返回当前部门id作为默认值 - 修改顶级部门查找逻辑，返回顶级部门ID而不是null - 避免因返回null导致的空指针异常问题
王彪总
1 parent 1701fd6a
Showing 3 changed files with 20 additions and 4 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/InspectionPlanController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/RoadController.java
@@ -130,7 +130,11 @@ public class InspectionPlanController {
             if(permissionApi.hasAnyRoles(loginUserId, "super_admin")){
                 pageReqVO.setCompanyId( null);
             }else{
-                pageReqVO.setCompanyId(SecurityFrameworkUtils.getCompanyId());
+                Long companyId = SecurityFrameworkUtils.getCompanyId();
+                if(null == companyId || companyId == 0L || companyId == 100L){
+                    companyId = null;
+                }
+                pageReqVO.setCompanyId(companyId);
             }
         }
         PageResult<InspectionPlanRespVO> pageResult = inspectionPlanService.getInspectionPlanPage(pageReqVO);
@@ -129,7 +129,11 @@ public class MaintainPlanController {
             if(permissionApi.hasAnyRoles(loginUserId, "super_admin")){
                 pageReqVO.setCompanyId( null);
             }else{
-                pageReqVO.setCompanyId(SecurityFrameworkUtils.getCompanyId());
+                Long companyId = SecurityFrameworkUtils.getCompanyId();
+                if(null == companyId || companyId == 0L || companyId == 100L){
+                    companyId = null;
+                }
+                pageReqVO.setCompanyId(companyId);
             }
         }
         PageResult<MaintainPlanRespVO> pageResult = maintainPlanService.getMaintainPlanPage(pageReqVO);
@@ -3,6 +3,8 @@ package com.zteits.urbanops.module.garden.controller.admin.road;
 import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
 import com.zteits.urbanops.module.system.api.permission.PermissionApi;
 import jakarta.annotation.security.PermitAll;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -37,6 +39,7 @@ import com.zteits.urbanops.module.garden.service.road.RoadService;
 @RequestMapping("/garden/road")
 @Validated
 public class RoadController {
+    private static final Logger log = LoggerFactory.getLogger(RoadController.class);
     @Resource
     private RoadService roadService;
@@ -94,7 +97,11 @@ public class RoadController {
             if(permissionApi.hasAnyRoles(loginUserId, "super_admin")){
                 pageReqVO.setCompanyId( null);
             }else{
-                pageReqVO.setCompanyId(SecurityFrameworkUtils.getCompanyId());
+                Long companyId = SecurityFrameworkUtils.getCompanyId();
+                if(null == companyId || companyId == 0L || companyId == 100L){
+                    companyId = null;
+                }
+                pageReqVO.setCompanyId(companyId);
             }
         }
         PageResult<RoadRespVO> pageResult = roadService.getRoadPage(pageReqVO);
@@ -127,6 +134,7 @@ public class RoadController {
     @GetMapping("/queryAllRoadList")
     @PermitAll
     public Map<String, Object> queryAllRoadList(@RequestParam(required = false) String roadName, @RequestParam(required = false) String deptCode, @RequestParam(required = false) String companyCode) {
+        log.info("物联网查询道路:companyCode:{},roadName:{},deptCode:{}",companyCode,roadName,deptCode);
         RoadListReqVO reqVO = new RoadListReqVO();
         reqVO.setRoadName(roadName);
         // 处理deptCode为空的情况
@@ -141,7 +149,7 @@ public class RoadController {
             roadMap.put("roadName", manager.getRoadName());
             return roadMap;
         }).collect(Collectors.toList());
-        
+
         // 构建返回格式
         Map<String, Object> result = new HashMap<>();
         result.put("msg", "操作成功");