Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/controller/SectionController.java

@@ -63,7 +63,7 @@ public class SectionController {
      * @param roadId
      * @return
      */
-    @GetMapping("/list/by/road/{roadId}/{deptId}")
+    @GetMapping("/list/by/road/dept/{roadId}/{deptId}")
     public JsonResult getListByRoadIdAndDeptId(@PathVariable("roadId") String roadId, @PathVariable("deptId") String deptId) {
         return sectionService.getListByRoadIdAndDeptId(roadId, deptId);
     }

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/road/RoadInformationServiceImpl.java

@@ -162,11 +162,9 @@ public class RoadInformationServiceImpl extends BaseServiceImpl<RoadInformationM
         String deptId = user.getDeptId();
         //获取公路列表
         List<RoadInformation> roadInformationList = new ArrayList<>();
-        if(null == deptId){
-            //超级管理员
-            if(RoleEnum.SUPER_ADMIN.getCode()== user.getRoleId()){
-                roadInformationList = this.getAllRoadInformationList(tenantId);
-            }
+        //超级管理员
+        if(RoleEnum.SUPER_ADMIN.getCode()== user.getRoleId()){
+            roadInformationList = this.getAllRoadInformationList(tenantId);
         }
         //部门管理员
         if(RoleEnum.ADMIN.getCode() == user.getRoleId()){
@@ -216,13 +214,13 @@ public class RoadInformationServiceImpl extends BaseServiceImpl<RoadInformationM
      * @return
      */
     private List<RoadInformation> getAllRoadInformationList(String tenantId) {
-        List<RoadInformation> roadList = roadInformationMapper.selectList(new LambdaQueryWrapper<RoadInformation>()
+        List<RoadInformation> roadInformationList = roadInformationMapper.selectList(new LambdaQueryWrapper<RoadInformation>()
                 .eq(RoadInformation::getTenantId, tenantId)
                 .eq(RoadInformation::getMark, 1));
-        if (CollectionUtil.isEmpty(roadList)) {
+        if (CollectionUtil.isEmpty(roadInformationList)) {
             return null;
         }
-        return roadList;
+        return roadInformationList;
     }
 
     /**