会员

src/main/java/io/v/nutz/sys/models/User.java

@@ -76,6 +76,9 @@ public class User {
     @Column
     private String education;
 
+    @Column
+    private String academicDegree;
+
     @Column
     private String hometown;
 
@@ -125,10 +128,7 @@ public class User {
     private String unioncode;
 
     @Column
-    private String campusId;
-
-    @Column
-    private String campusName;
+    private String campus;
 
     @Column
     private String activityUnionId;

src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HtmlUtil;
 import io.v.nutz.base.utils.ManyAddOrRenewUtil;
 import io.v.nutz.base.utils.Roles;
@@ -534,6 +535,13 @@ public class SourceUserServiceImpl extends ViServiceImpl<UserSource> implements
             if (List.of("retireDate", "welfareStopDate", "idcard").contains(fieldName)) {
                 continue;
             }
+
+            if (List.of("education", "campus", "academicDegree").contains(fieldName)) {
+                if (StrUtil.isBlank(sourceMap.getString(fieldName, "")) && StrUtil.isNotBlank(newMap.getString(fieldName, ""))) {
+                    continue;
+                }
+            }
+
             memberCommonService.extractChange(newMap, sourceMap, fieldName, dictMap, changeList);
         }
         if (Lang.isEmpty(changeList)) {
@@ -582,6 +590,12 @@ public class SourceUserServiceImpl extends ViServiceImpl<UserSource> implements
             if (List.of("retireDate", "welfareStopDate", "idcard").contains(fieldName)) {
                 continue;
             }
+
+            if (List.of("education", "campus", "academicDegree").contains(fieldName)) {
+                if (StrUtil.isBlank(sourceMap.getString(fieldName, "")) && StrUtil.isNotBlank(newMap.getString(fieldName, ""))) {
+                    continue;
+                }
+            }
             memberCommonService.extractChange(newMap, sourceMap, fieldName, dictMap, changeList);
         }
         if (Lang.isEmpty(changeList)) {