jiawuxian пре 2 година
родитељ
комит
47a2b39876

+ 2 - 0
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/dto/register/GrantDto.java

@@ -25,5 +25,7 @@ public class GrantDto {
     @ApiModelProperty("任务id")
     private Long taskId;
 
+    @NotNull
+    @ApiModelProperty("授权目录用户id")
     private Long userId;
 }

+ 2 - 2
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/SafetyCheckRegisterSericeImpl.java

@@ -463,8 +463,8 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
             throw new ServiceException("任务不存在");
         }
 
-        if (ObjectUtil.equal(taskOptional.get().getStatus(), SafetyCheckTaskStatus.Completed.getValue())) {
-            throw new ServiceException("任务已完成");
+        if (ObjectUtil.equal(taskOptional.get().getDoneStatus(), SafetyCheckTaskStatus.Completed.getValue())) {
+            throw new ServiceException("任务已完成,不能授权");
         }
         Long loginUserId = SecurityUtils.getUserId();
         if (ObjectUtil.isNotNull(dto.getUserId())) {