diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlanAssignSteerModifyVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlanAssignSteerModifyVO.java index 2133faa63..51bbc5170 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlanAssignSteerModifyVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlanAssignSteerModifyVO.java @@ -38,4 +38,8 @@ public class PlanAssignSteerModifyVO extends PlanAssignSteerModify { @Schema(description = "审批意见") String remark; + + public static final Integer RESULT_PASS = 1; + public static final Integer RESULT_REJECT = 2; + } \ No newline at end of file diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlanAssignSteerModifyServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlanAssignSteerModifyServiceImpl.java index 754b2a90d..579527f26 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlanAssignSteerModifyServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlanAssignSteerModifyServiceImpl.java @@ -37,6 +37,9 @@ import java.util.stream.Collectors; import cn.hutool.core.date.DateUtil; +import static org.springblade.desk.basic.pojo.vo.PlanAssignSteerModifyVO.RESULT_PASS; +import static org.springblade.desk.basic.pojo.vo.PlanAssignSteerModifyVO.RESULT_REJECT; + /** * [分派控制调整] 服务实现类 * @@ -322,12 +325,12 @@ public class PlanAssignSteerModifyServiceImpl extends BaseServiceImpl 2) { - return R.fail("审批结果: 1-通过, 2-驳回"); - } String remark = vo.getRemark(); - if (2 == result && StrUtil.isEmpty(remark)) { - return R.fail("请填写审批意见"); - } return service.audit(id, result, remark); }