Browse Source

Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tags/v1.0.0^2
wanjing 1 year ago
parent
commit
862bc98139
1 changed files with 3 additions and 1 deletions
  1. +3
    -1
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/handle/ExecuteHandle.java

+ 3
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/handle/ExecuteHandle.java View File

@@ -51,7 +51,9 @@ public class ExecuteHandle implements GenerateInspectionFieldHander {
} else if (RoleEnum.ADMIN.getCode() == user.getRoleId()) {
// 管理员可对本部门的任务执行此操作
if (user.getDeptId().equals(inspectionVo.getDeptId())) {
inspectionVo.setExecute(true);
if (1 == inspectionVo.getExecutionStatus()) {
inspectionVo.setExecute(true);
}
}
} else if (RoleEnum.ORDINARY_USER.getCode() == user.getRoleId()) {
// 普通用户可对自己创建的任务执行此操作

Loading…
Cancel
Save