Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into feature_v1.0

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

@@ -163,6 +163,7 @@ public class InspectionController {
      */
     @PostMapping("/uploadFlightUrl")
     public JsonResult uploadFlightUrl(@RequestBody UploadFlightUrlRequest request) {
+        log.info("进入上传离线视频回调接口");
         return iInspectionService.uploadFlightUrl(request);
     }
 
@@ -174,6 +175,7 @@ public class InspectionController {
      */
     @PostMapping("/updateTaskByCode")
     public JsonResult updateTaskByCode(@RequestBody UpdateTaskByCodeRequest request) {
+        log.info("进入修改巡检任务回调接口");
         return iInspectionService.updateTaskByCode(request);
     }
 

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/enums/code/dept/DeleteDeptCodeEnum.java

@@ -14,8 +14,8 @@ public enum DeleteDeptCodeEnum {
     DELETE_DEPT_IS_FAILED(1200500, "删除部门失败"),
     DEPT_ID_IS_NULL(1200501, "部门id为空"),
     DEPT_IS_NOT_EXIST(1200502, "部门不存在"),
-    DEPT_IEXIST_USER(1200503, "该级部已绑定用户"),
-    DEPT_IEXIST_CHILDREN_DEPT(1200504, "该级部下有子部门");
+    DEPT_IEXIST_USER(1200503, "该部门下有绑定用户"),
+    DEPT_IEXIST_CHILDREN_DEPT(1200504, "该部门下有子部门");
 
     /**
      * 错误码

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/handle/ExecuteHandle.java

@@ -45,7 +45,10 @@ public class ExecuteHandle implements GenerateInspectionFieldHander {
             return;
         }
 
-        if (RoleEnum.ADMIN.getCode() == user.getRoleId()) {
+        if (RoleEnum.SUPER_ADMIN.getCode() == user.getRoleId()) {
+            // 超级管理员不能执行任务操作
+            inspectionVo.setExecute(false);
+        } else if (RoleEnum.ADMIN.getCode() == user.getRoleId()) {
             // 管理员可对本部门的任务执行此操作
             if (user.getDeptId().equals(inspectionVo.getDeptId())) {
                 inspectionVo.setExecute(true);