commit

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

@@ -537,7 +537,7 @@ public class SourceUserServiceImpl extends ViServiceImpl<UserSource> implements
             }
 
             if (List.of("education", "campus", "academicDegree").contains(fieldName)) {
-                if (StrUtil.isBlank(sourceMap.getString(fieldName, "")) && StrUtil.isNotBlank(newMap.getString(fieldName, ""))) {
+                if (StrUtil.isNotBlank(sourceMap.getString(fieldName, "")) && StrUtil.isBlank(newMap.getString(fieldName, ""))) {
                     continue;
                 }
             }

src/main/resources/logback.xml

@@ -10,7 +10,7 @@
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="org.nutz.boot.starter.logback.exts.logfile.LogfileTimeBasedRollingPolicy">
             <fileNamePattern>/app/logs/mini-%d{yyyy-MM-dd}.log</fileNamePattern>
-            <maxHistory>15</maxHistory>
+            <maxHistory>180</maxHistory>
         </rollingPolicy>
         <encoder>
             <pattern>[%-5level] %d{HH:mm:ss.SSS} %logger - %msg%n</pattern>

src/main/resources/views/mobile/member/apply/common/memberApplyAuditInfo.js

@@ -44,6 +44,7 @@ const MEMBER_APPLY_AUDIT_INFO = {
 <!--                            <van-cell title="会员状态">{{ viewData.member ? '会员' : '非会员' }}</van-cell>-->
 <!--                            <van-cell title="福利会员状态">{{ viewData.welfareMember ? '福利会员' : '非福利会员' }}</van-cell>-->
 
+                            <template v-if="viewData.loginname === storageUser.loginname">
                                 <van-cell title="家庭成员" class="column-cell">
                                     <table class="family-table">
                                         <thead>
@@ -72,6 +73,7 @@ const MEMBER_APPLY_AUDIT_INFO = {
                                         <span style="font-size: 14px" v-else>无数据</span>
                                     </template>
                                 </van-cell>
+                            </template>
 
                             <van-cell title="签字">
                                 <template #label>
@@ -111,7 +113,9 @@ const MEMBER_APPLY_AUDIT_INFO = {
                 branchAudit: {}
             },
 
-            clickUpOrDown: true
+            clickUpOrDown: true,
+
+            storageUser: {}
         }
     },
     methods:{
@@ -128,6 +132,9 @@ const MEMBER_APPLY_AUDIT_INFO = {
             }
         }
     },
+    created(){
+        this.storageUser = JSON.parse(window.sessionStorage.getItem('user'))
+    },
     style: /*language=CSS*/
         `
             .column-cell {

src/main/resources/views/mobile/member/change/branchUnionAudit/index.html

@@ -46,7 +46,7 @@ layout("/mobile/platform.html"){
 <div id="app" v-cloak>
 
     <van-nav-bar title="会员变更分工会审核" left-arrow placeholder fixed
-                 @click-left="history.back()"></van-nav-bar>
+                 @click-left="pjaxReplace('/mobile/index')"></van-nav-bar>
 
     <div class="search-fixed">
         <van-search

src/main/resources/views/mobile/member/change/common/memberChangeInfo.js

@@ -24,10 +24,12 @@ const MEMBER_CHANGE_INFO = {
                         <van-cell title="人员性质" :value="viewData.preparedBy" />
                         <van-cell title="会员状态" :value="viewData.member ? '会员' : '非会员'" />
                         <van-cell title="福利会员状态" :value="viewData.welfareMember ? '福利会员' : '非福利会员'" />
+                        <template v-if="viewData.loginname === storageUser.loginname">
                             <van-cell title="个人简况">
                                 <div v-if="viewData.vita" class="text-left" v-html="viewData.vita"></div>
                                 <span v-else>无数据</span>
                             </van-cell>
+                        </template>
                     </van-cell-group>
                 </van-tab>
                 <van-tab title="变更信息" class="mb10">
@@ -85,6 +87,8 @@ const MEMBER_CHANGE_INFO = {
                 schoolAudit: {},
                 branchAudit: {}
             },
+
+            storageUser: {}
         }
     },
     methods: {
@@ -99,7 +103,7 @@ const MEMBER_CHANGE_INFO = {
         },
     },
     async created() {
-
+        this.storageUser = JSON.parse(window.sessionStorage.getItem('user'))
     },
     style: /*language=CSS*/`
         .change_info .van-empty {

src/main/resources/views/mobile/member/change/mine/index.html

@@ -46,7 +46,7 @@ layout("/mobile/platform.html"){
 <div id="app" v-cloak>
 
     <van-nav-bar title="我的变更申请" left-arrow placeholder fixed
-                 @click-left="history.back()"></van-nav-bar>
+                 @click-left="pjaxReplace('/mobile/index')"></van-nav-bar>
 
     <div class="search-fixed">
         <van-search

src/main/resources/views/mobile/member/change/schoolUnionAudit/index.html

@@ -46,7 +46,7 @@ layout("/mobile/platform.html"){
 <div id="app" v-cloak>
 
     <van-nav-bar title="会员变更校工会审核" left-arrow placeholder fixed
-                 @click-left="history.back()"></van-nav-bar>
+                 @click-left="pjaxReplace('/mobile/index')"></van-nav-bar>
 
     <div class="search-fixed">
         <van-search

src/main/resources/views/mobile/member/common/memberInfoH5.js

@@ -29,6 +29,7 @@ const MEMBER_INFO_H5 = {
                 <van-cell title="会员状态">{{ viewData.member ? '会员' : '非会员' }}</van-cell>
                 <van-cell title="福利会员状态">{{ viewData.welfareMember ? '福利会员' : '非福利会员' }}</van-cell>
 
+                <template v-if="viewData.loginname === storageUser.loginname">
                     <van-cell title="家庭成员收入" class="column-cell">
                         <table class="family-table">
                             <thead>
@@ -55,12 +56,15 @@ const MEMBER_INFO_H5 = {
                         <div v-if="viewData.vita" class="text-left" v-html="viewData.vita"></div>
                         <span v-else>无数据</span>
                     </van-cell>
+                </template>
             </van-cell-group>
         </div>
     `,
     data(){
         return{
-            viewData: {}
+            viewData: {},
+
+            storageUser: {}
         }
     },
     methods: {
@@ -76,6 +80,6 @@ const MEMBER_INFO_H5 = {
         }
     },
     created() {
-
+        this.storageUser = JSON.parse(window.sessionStorage.getItem('user'))
     }
 }