商标申请

src/main/java/com/izouma/uwip/domain/LogoPatent.java

@@ -78,7 +78,7 @@ public class LogoPatent extends BaseEntity {
     private boolean rejectAll;
 
     @ApiModelProperty(value = "驳回意见")
-    private boolean rejectContent;
+    private String rejectContent;
 
     @ApiModelProperty(value = "是否复审")
     private boolean rehear;

src/main/java/com/izouma/uwip/service/LogoPatentService.java

@@ -52,7 +52,9 @@ public class LogoPatentService {
             }
             ObjUtils.merge(orig, record);
 //            orig.getHandle().add(this.saveHandle(workflow, userId));
-            orig.setApplyStatus(this.getApplyStatus(workflow));
+            if (ObjectUtil.isNull(record.getApplyStatus()) || !ApplyStatus.COMPLETED.equals(record.getApplyStatus())) {
+                orig.setApplyStatus(this.getApplyStatus(workflow));
+            }
             return logoPatentRepo.save(orig);
         }
         if (record.getSort() == 0) {