diff --git a/src/main/java/io/v/nutz/sys/models/User.java b/src/main/java/io/v/nutz/sys/models/User.java index 859d364..89cd122 100644 --- a/src/main/java/io/v/nutz/sys/models/User.java +++ b/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; diff --git a/src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java b/src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java index af20154..3633285 100644 --- a/src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java +++ b/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 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 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)) { diff --git a/src/main/resources/views/mobile/member/apply/branchUnionAudit/index.html b/src/main/resources/views/mobile/member/apply/branchUnionAudit/index.html index 479cdb8..ccaaa44 100644 --- a/src/main/resources/views/mobile/member/apply/branchUnionAudit/index.html +++ b/src/main/resources/views/mobile/member/apply/branchUnionAudit/index.html @@ -305,6 +305,9 @@ layout("/mobile/platform.html"){ }, }, created() { + if (window.innerWidth > 768 && location.pathname === '/platform/member/apply/branchUnion/audit/h5') { + window.location.replace('/platform/member/apply/branchUnion/audit'); + } this.initData() } }) diff --git a/src/main/resources/views/mobile/member/apply/mine/index.html b/src/main/resources/views/mobile/member/apply/mine/index.html index 4a07849..c92fb37 100644 --- a/src/main/resources/views/mobile/member/apply/mine/index.html +++ b/src/main/resources/views/mobile/member/apply/mine/index.html @@ -128,6 +128,15 @@ layout("/mobile/platform.html"){ + + + + + + + + + +