From b2ee7f900857304c5263b1af4993c589383b4622 Mon Sep 17 00:00:00 2001
From: Paidax <paidax.422@qq.com>
Date: Fri, 5 Sep 2025 14:06:35 +0800
Subject: [PATCH] commit

---
 .../service/impl/SourceUserServiceImpl.java   |  2 +-
 src/main/resources/logback.xml                |  2 +-
 .../apply/common/memberApplyAuditInfo.js      | 65 ++++++++++---------
 .../member/change/branchUnionAudit/index.html |  2 +-
 .../member/change/common/memberChangeInfo.js  | 14 ++--
 .../mobile/member/change/mine/index.html      |  2 +-
 .../member/change/schoolUnionAudit/index.html |  2 +-
 .../mobile/member/common/memberInfoH5.js      | 60 +++++++++--------
 8 files changed, 82 insertions(+), 67 deletions(-)

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 3633285..c1e2d2f 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
@@ -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;
                 }
             }
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index 7968e6d..319ed65 100644
--- a/src/main/resources/logback.xml
+++ b/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>
diff --git a/src/main/resources/views/mobile/member/apply/common/memberApplyAuditInfo.js b/src/main/resources/views/mobile/member/apply/common/memberApplyAuditInfo.js
index 7284753..7b0e3c8 100644
--- a/src/main/resources/views/mobile/member/apply/common/memberApplyAuditInfo.js
+++ b/src/main/resources/views/mobile/member/apply/common/memberApplyAuditInfo.js
@@ -44,34 +44,36 @@ const MEMBER_APPLY_AUDIT_INFO = {
 <!--                            <van-cell title="会员状态">{{ viewData.member ? '会员' : '非会员' }}</van-cell>-->
 <!--                            <van-cell title="福利会员状态">{{ viewData.welfareMember ? '福利会员' : '非福利会员' }}</van-cell>-->
 
-                            <van-cell title="家庭成员" class="column-cell">
-                                <table class="family-table">
-                                    <thead>
-                                    <tr>
-                                        <th class="table-header">序号</th>
-                                        <th class="table-header">与本人关系</th>
-                                        <th class="table-header">姓名</th>
-                                        <th class="table-header">单位</th>
-                                        <th class="table-header">备注</th>
-                                    </tr>
-                                    </thead>
-                                    <tbody>
-                                    <tr class="table-row" v-for="(item, index) in viewData.families" :key="index">
-                                        <td class="table-cell">{{ index + 1 }}</td>
-                                        <td class="table-cell">{{ item.relation }}</td>
-                                        <td class="table-cell">{{ item.name }}</td>
-                                        <td class="table-cell">{{ item.unit }}</td>
-                                        <td class="table-cell">{{ item.remark }}</td>
-                                    </tr>
-                                    </tbody>
-                                </table>
-                            </van-cell>
-                            <van-cell title="个人简历">
-                                <template #label>
-                                    <div v-if="viewData.vita" class="text-left" v-html="viewData.vita"></div>
-                                    <span style="font-size: 14px" v-else>无数据</span>
-                                </template>
-                            </van-cell>
+                            <template v-if="viewData.loginname === storageUser.loginname">
+                                <van-cell title="家庭成员" class="column-cell">
+                                    <table class="family-table">
+                                        <thead>
+                                        <tr>
+                                            <th class="table-header">序号</th>
+                                            <th class="table-header">与本人关系</th>
+                                            <th class="table-header">姓名</th>
+                                            <th class="table-header">单位</th>
+                                            <th class="table-header">备注</th>
+                                        </tr>
+                                        </thead>
+                                        <tbody>
+                                        <tr class="table-row" v-for="(item, index) in viewData.families" :key="index">
+                                            <td class="table-cell">{{ index + 1 }}</td>
+                                            <td class="table-cell">{{ item.relation }}</td>
+                                            <td class="table-cell">{{ item.name }}</td>
+                                            <td class="table-cell">{{ item.unit }}</td>
+                                            <td class="table-cell">{{ item.remark }}</td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                </van-cell>
+                                <van-cell title="个人简历">
+                                    <template #label>
+                                        <div v-if="viewData.vita" class="text-left" v-html="viewData.vita"></div>
+                                        <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 {
diff --git a/src/main/resources/views/mobile/member/change/branchUnionAudit/index.html b/src/main/resources/views/mobile/member/change/branchUnionAudit/index.html
index 8d75299..4dfeed5 100644
--- a/src/main/resources/views/mobile/member/change/branchUnionAudit/index.html
+++ b/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
diff --git a/src/main/resources/views/mobile/member/change/common/memberChangeInfo.js b/src/main/resources/views/mobile/member/change/common/memberChangeInfo.js
index 4c07363..0d12cf6 100644
--- a/src/main/resources/views/mobile/member/change/common/memberChangeInfo.js
+++ b/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 ? '福利会员' : '非福利会员'" />
-                        <van-cell title="个人简况">
-                            <div v-if="viewData.vita" class="text-left" v-html="viewData.vita"></div>
-                            <span v-else>无数据</span>
-                        </van-cell>
+                        <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 {
diff --git a/src/main/resources/views/mobile/member/change/mine/index.html b/src/main/resources/views/mobile/member/change/mine/index.html
index 6d938ea..d24d481 100644
--- a/src/main/resources/views/mobile/member/change/mine/index.html
+++ b/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
diff --git a/src/main/resources/views/mobile/member/change/schoolUnionAudit/index.html b/src/main/resources/views/mobile/member/change/schoolUnionAudit/index.html
index b5ad201..65b29e5 100644
--- a/src/main/resources/views/mobile/member/change/schoolUnionAudit/index.html
+++ b/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
diff --git a/src/main/resources/views/mobile/member/common/memberInfoH5.js b/src/main/resources/views/mobile/member/common/memberInfoH5.js
index ce5881c..5121960 100644
--- a/src/main/resources/views/mobile/member/common/memberInfoH5.js
+++ b/src/main/resources/views/mobile/member/common/memberInfoH5.js
@@ -29,38 +29,42 @@ const MEMBER_INFO_H5 = {
                 <van-cell title="会员状态">{{ viewData.member ? '会员' : '非会员' }}</van-cell>
                 <van-cell title="福利会员状态">{{ viewData.welfareMember ? '福利会员' : '非福利会员' }}</van-cell>
 
-                <van-cell title="家庭成员收入" class="column-cell">
-                    <table class="family-table">
-                        <thead>
-                        <tr>
-                            <th class="table-header">序号</th>
-                            <th class="table-header">与本人关系</th>
-                            <th class="table-header">姓名</th>
-                            <th class="table-header">单位</th>
-                            <th class="table-header">备注</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr class="table-row" v-for="(item, index) in viewData.families" :key="index">
-                            <td class="table-cell">{{ index + 1 }}</td>
-                            <td class="table-cell">{{ item.name }}</td>
-                            <td class="table-cell">{{ item.age }}</td>
-                            <td class="table-cell">{{ item.relation }}</td>
-                            <td class="table-cell">{{ item.monthlyIncome }}</td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </van-cell>
-                <van-cell title="个人简历">
-                    <div v-if="viewData.vita" class="text-left" v-html="viewData.vita"></div>
-                    <span v-else>无数据</span>
-                </van-cell>
+                <template v-if="viewData.loginname === storageUser.loginname">
+                    <van-cell title="家庭成员收入" class="column-cell">
+                        <table class="family-table">
+                            <thead>
+                            <tr>
+                                <th class="table-header">序号</th>
+                                <th class="table-header">与本人关系</th>
+                                <th class="table-header">姓名</th>
+                                <th class="table-header">单位</th>
+                                <th class="table-header">备注</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            <tr class="table-row" v-for="(item, index) in viewData.families" :key="index">
+                                <td class="table-cell">{{ index + 1 }}</td>
+                                <td class="table-cell">{{ item.name }}</td>
+                                <td class="table-cell">{{ item.age }}</td>
+                                <td class="table-cell">{{ item.relation }}</td>
+                                <td class="table-cell">{{ item.monthlyIncome }}</td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </van-cell>
+                    <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>
         </div>
     `,
     data(){
         return{
-            viewData: {}
+            viewData: {},
+
+            storageUser: {}
         }
     },
     methods: {
@@ -76,6 +80,6 @@ const MEMBER_INFO_H5 = {
         }
     },
     created() {
-
+        this.storageUser = JSON.parse(window.sessionStorage.getItem('user'))
     }
 }