Browse Source

fixbug: 事后审核科室审核同意时,不校验申诉理由

Scott 2 năm trước cách đây
mục cha
commit
f595e53d48

+ 2 - 2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/common/bo/DeptAuditRequestBO.java

@@ -20,11 +20,11 @@ import javax.validation.constraints.NotBlank;
 public class DeptAuditRequestBO extends AuditRequestBO{
 
     @Length(min= 1, max=200 , message = "申诉理由不可小于1,不可大于200")
-    @NotBlank(message = "审核理由不可为空")
+//    @NotBlank(message = "审核理由不可为空")
     @ApiModelProperty(value = "审核理由")
     private String description;
 
-    @NotBlank(message = "必须上传图片")
+//    @NotBlank(message = "必须上传图片")
     @ApiModelProperty(value = "审核照片组,中间用逗号分割")
     private String imgPaths;
 

+ 8 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/impl/AfterwardsAuditServiceImpl.java

@@ -269,6 +269,14 @@ public class AfterwardsAuditServiceImpl extends ServiceImpl<AfterwardsAuditMappe
         // 2.开始校验处理状态
         switch (enums) {
             case appeal: //"appeal": //申诉
+
+                if (!StringUtils.hasText(param.getDescription())) {
+                    throw new JeecgBootException("申诉理由不可为空,请检查");
+                }
+                if (!StringUtils.hasText(param.getImgPaths())) {
+                    throw new JeecgBootException("申诉图片不可为空,请检查");
+                }
+
                 appealRecord.setDescription(param.getDescription());
                 appealRecord.setImgPath(param.getImgPaths());