Browse Source

样本送检Long类型字段忽略null值总是保持更新

陈长荣 2 tháng trước cách đây
mục cha
commit
36a1cd6cae

+ 5 - 1
jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/entity/SampleInfo.java

@@ -1,5 +1,7 @@
 package com.github.jfcloud.gene.sample.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.github.jfcloud.gene.common.entity.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -27,11 +29,11 @@ public class SampleInfo extends BaseEntity {
     @Schema(description = "状态")
     private String status;
 
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     @Schema(description = "申请人id")
     private Long applicantId;
 
     @Schema(description = "申请人名称")
-
     private String applicantName;
 
     @Schema(description = "申请人电话")
@@ -49,12 +51,14 @@ public class SampleInfo extends BaseEntity {
     @Schema(description = "备注")
     private String remark;
 
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     @Schema(description = "部门负责人Id")
     private Long departLeaderId;
 
     @Schema(description = "部门负责人姓名")
     private String departLeaderName;
 
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     @Schema(description = "项目管理部审核人")
     private Long projectManageId;
 

+ 2 - 2
jfcloud-gene-common/src/main/java/com/github/jfcloud/gene/common/interceptor/interceptor/StuffInterceptor.java

@@ -133,7 +133,7 @@ public class StuffInterceptor implements Interceptor {
                     AutoStuff autoStuff = field.getAnnotation(AutoStuff.class);
                     if (autoStuff != null) {
                         String annoType = autoStuff.annoType().getAnnoType();
-                        if (AnnoEnum.UPDATE_BY.getAnnoType().equals(annoType)) {
+                        if (AnnoEnum.UPDATE_BY.getAnnoType().equals(annoType) && userId != null) {
                             field.set(value, userId.toString());
                         }
                         if (AnnoEnum.UPDATE_TIME.getAnnoType().equals(annoType)) {
@@ -152,7 +152,7 @@ public class StuffInterceptor implements Interceptor {
             AutoStuff autoStuff = field.getAnnotation(AutoStuff.class);
             if (autoStuff != null) {
                 String annoType = autoStuff.annoType().getAnnoType();
-                if (AnnoEnum.UPDATE_BY.getAnnoType().equals(annoType)) {
+                if (AnnoEnum.UPDATE_BY.getAnnoType().equals(annoType) && userId != null) {
                     field.set(paramObj, userId.toString());
                 }
                 if (AnnoEnum.UPDATE_TIME.getAnnoType().equals(annoType)) {