From dd9f161ab948400f9ebabd95abd17aa11f17c7af Mon Sep 17 00:00:00 2001
From: Paidax <paidax.422@qq.com>
Date: Fri, 26 Sep 2025 08:51:15 +0800
Subject: [PATCH] commit

---
 .../app/sys/controller/SysHomeController.java     |  2 +-
 .../app/sys/services/impl/SysUserServiceImpl.java |  2 +-
 .../sports/models/ActivitySchoolTeam.java         |  4 ++--
 src/main/resources/views/layouts/v4/apps.html     |  6 +++---
 .../views/platform/sys/union/branchUnionManage.js |  2 +-
 .../zhgh/activity/family/manage/basicForm.js      |  4 ++--
 .../zhgh/activity/family/manage/index.html        |  2 +-
 .../zhgh/activity/sports/applyUser/index.html     |  6 +++---
 .../zhgh/activity/trainSignUp/manage/basicForm.js |  4 ++--
 .../zhgh/activity/trainSignUp/manage/index.html   |  2 +-
 .../staffmanage/sourcechange/manage/index.html    | 15 +++++++++++++--
 11 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/budwk/app/sys/controller/SysHomeController.java b/src/main/java/com/budwk/app/sys/controller/SysHomeController.java
index 764f3c90..61ac3aef 100644
--- a/src/main/java/com/budwk/app/sys/controller/SysHomeController.java
+++ b/src/main/java/com/budwk/app/sys/controller/SysHomeController.java
@@ -64,7 +64,7 @@ public class SysHomeController {
         String userAgentStr = req.getHeader("User-Agent");
         UserAgent userAgent = UserAgentUtil.parse(userAgentStr);
         if (!userAgent.isMobile()) {
-            return "beetl:/layouts/v4/home.html";
+            return "beetl:/layouts/v4/home/index.html";
         } else {
             return "beetl:/platform/zhghh5/sys/home/index.html";
         }
diff --git a/src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java b/src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java
index f0ec7d19..4bf283da 100644
--- a/src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java
+++ b/src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java
@@ -307,7 +307,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<Sys_user> implements Sys
         String decodePwd = Base64Decoder.decodeStr(passowrd);
         String hashedPassword = PwdUtil.getPassword(decodePwd, user.getSalt());
         if (!Strings.sNull(hashedPassword).equalsIgnoreCase(user.getPassword())) {
-//            throw new BaseException("用户名或者密码不正确");
+            throw new BaseException("用户名或者密码不正确");
         }
         user = this.fetchLinks(user, "unit");
         if (Lang.isNotEmpty(user.getUnit()) && StrUtil.isNotBlank(user.getUnit().getUnionId())) {
diff --git a/src/main/java/com/budwk/app/zhgh/activity/sports/models/ActivitySchoolTeam.java b/src/main/java/com/budwk/app/zhgh/activity/sports/models/ActivitySchoolTeam.java
index 11a09feb..b647a021 100644
--- a/src/main/java/com/budwk/app/zhgh/activity/sports/models/ActivitySchoolTeam.java
+++ b/src/main/java/com/budwk/app/zhgh/activity/sports/models/ActivitySchoolTeam.java
@@ -57,8 +57,8 @@ public class ActivitySchoolTeam extends BaseModel implements Serializable {
     @Column
     @Comment("排序")
     @Prev({
-            @SQL(db = DB.MYSQL, value = "SELECT IFNULL(MAX(location),0)+1 FROM Activity_School_Team"),
-            @SQL(db = DB.ORACLE, value = "SELECT COALESCE(MAX(location),0)+1 FROM Activity_School_Team")
+            @SQL(db = DB.MYSQL, value = "SELECT IFNULL(MAX(location),0)+1 FROM activity_school_team"),
+            @SQL(db = DB.ORACLE, value = "SELECT COALESCE(MAX(location),0)+1 FROM activity_school_team")
     })
     private Integer location;
 
diff --git a/src/main/resources/views/layouts/v4/apps.html b/src/main/resources/views/layouts/v4/apps.html
index b32967dd..0c3e31b1 100644
--- a/src/main/resources/views/layouts/v4/apps.html
+++ b/src/main/resources/views/layouts/v4/apps.html
@@ -374,9 +374,9 @@ layout("/layouts/v4/baseLayout.html"){
             <div class="apps-grid" v-if="applications.length > 0">
                 <div v-for="app in applications" :key="app.id" class="app-card" @click.stop="openApp(app)">
                     <div :class="['app-icon', app.iconType]">
-                        <i v-if="app.icon && !app.picIcon" :class="app.icon"></i>
-                        <img v-else-if="app.picIcon" :src="app.picIcon" :alt="app.name || ''" />
-                        <i v-else class="fa fa-skype"></i>
+<!--                        <i v-if="app.icon && !app.picIcon" :class="app.icon"></i>-->
+<!--                        <img v-else-if="app.picIcon" :src="app.picIcon" :alt="app.name || ''" />-->
+                        <i class="fa fa-skype"></i>
                     </div>
                     <div class="app-info">
                         <div class="app-title">{{ app.name }}</div>
diff --git a/src/main/resources/views/platform/sys/union/branchUnionManage.js b/src/main/resources/views/platform/sys/union/branchUnionManage.js
index b867e624..2e206262 100644
--- a/src/main/resources/views/platform/sys/union/branchUnionManage.js
+++ b/src/main/resources/views/platform/sys/union/branchUnionManage.js
@@ -46,7 +46,7 @@ const branchUnionManage = {
                     <el-input v-model="formData.unionCode" maxlength="100" placeholder="工会编码"></el-input>
                 </el-form-item>
                 <el-form-item label="校区" prop="campus">
-                    <dict-select v-model="formData.campus" code="CAMPUS"></dict-select>
+                    <dict-select v-model="formData.campus" code="USER_CAMPUS"></dict-select>
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
diff --git a/src/main/resources/views/platform/zhgh/activity/family/manage/basicForm.js b/src/main/resources/views/platform/zhgh/activity/family/manage/basicForm.js
index ef2176de..cbe2794d 100644
--- a/src/main/resources/views/platform/zhgh/activity/family/manage/basicForm.js
+++ b/src/main/resources/views/platform/zhgh/activity/family/manage/basicForm.js
@@ -218,7 +218,7 @@ const basicForm = {
                         <el-table-column label="校区" prop="campus">
                             <template v-slot="{row}">
                                 <el-select size="small" v-model="row.campus" style="width: 100%">
-                                    <el-option :label="item.name" :value="item.name" :key="item.code" v-for="item in dict.type.CAMPUS"></el-option>
+                                    <el-option :label="item.name" :value="item.name" :key="item.code" v-for="item in dict.type.USER_CAMPUS"></el-option>
                                 </el-select>
                             </template>
                         </el-table-column>
@@ -321,7 +321,7 @@ const basicForm = {
             <custom-form ref="customFormRef"></custom-form>
         </div>
     `,
-    dicts: ["CAMPUS", "FAMILY_SIGNUP_TYPE"],
+    dicts: ["USER_CAMPUS", "FAMILY_SIGNUP_TYPE"],
     data() {
         return {
             signUpDialog: false,
diff --git a/src/main/resources/views/platform/zhgh/activity/family/manage/index.html b/src/main/resources/views/platform/zhgh/activity/family/manage/index.html
index efe24639..508fea8e 100644
--- a/src/main/resources/views/platform/zhgh/activity/family/manage/index.html
+++ b/src/main/resources/views/platform/zhgh/activity/family/manage/index.html
@@ -133,7 +133,7 @@ layout("/layouts/platform.html"){
     new Vue({
         el: "#app",
         store,
-        dicts: ["CAMPUS", "FAMILY_SIGNUP_TYPE"],
+        dicts: ["USER_CAMPUS", "FAMILY_SIGNUP_TYPE"],
         mixins: [initTableMixins],
         components: {
             "info": info,
diff --git a/src/main/resources/views/platform/zhgh/activity/sports/applyUser/index.html b/src/main/resources/views/platform/zhgh/activity/sports/applyUser/index.html
index d5748524..889f42a3 100644
--- a/src/main/resources/views/platform/zhgh/activity/sports/applyUser/index.html
+++ b/src/main/resources/views/platform/zhgh/activity/sports/applyUser/index.html
@@ -24,7 +24,7 @@ layout("/layouts/platform.html"){
         <template>
             <el-card shadow="never">
                 <search @search="activityInfoData">
-                    <search-item label="">
+                    <search-item label="年度">
                         <el-date-picker
                                 @change="activityInfoData"
                                 placeholder="选择年"
@@ -35,14 +35,14 @@ layout("/layouts/platform.html"){
                         ></el-date-picker>
                     </search-item>
 
-                    <search-item label="">
+                    <search-item label="报名状态">
                         <el-radio-group @change="activityInfoData" v-model="pageForm.isActivity">
                             <el-radio-button :label="1">全部</el-radio-button>
                             <el-radio-button :label="2">报名中</el-radio-button>
                             <el-radio-button :label="3">已结束</el-radio-button>
                         </el-radio-group>
                     </search-item>
-                    <search-item label=""
+                    <search-item label="所属工会"
                                  v-if="$auth.hasRole('SYSADMIN')||$auth.hasRole('SCHOOL_UNION_ADMIN')">
                         <el-select
                                 @change="doSearch"
diff --git a/src/main/resources/views/platform/zhgh/activity/trainSignUp/manage/basicForm.js b/src/main/resources/views/platform/zhgh/activity/trainSignUp/manage/basicForm.js
index 8795c42a..85e90918 100644
--- a/src/main/resources/views/platform/zhgh/activity/trainSignUp/manage/basicForm.js
+++ b/src/main/resources/views/platform/zhgh/activity/trainSignUp/manage/basicForm.js
@@ -206,7 +206,7 @@ const basicForm = {
                         <el-table-column label="校区" prop="campus">
                             <template v-slot="{row}">
                                 <el-select size="small" v-model="row.campus" style="width: 100%">
-                                    <el-option :label="item.name" :value="item.name" :key="item.code" v-for="item in dict.type.CAMPUS"></el-option>
+                                    <el-option :label="item.name" :value="item.name" :key="item.code" v-for="item in dict.type.USER_CAMPUS"></el-option>
                                 </el-select>
                             </template>
                         </el-table-column>
@@ -302,7 +302,7 @@ const basicForm = {
             <custom-form ref="customFormRef"></custom-form>
         </div>
     `,
-    dicts: ["CAMPUS", "TRAIN_SIGNUP_TYPE"],
+    dicts: ["USER_CAMPUS", "TRAIN_SIGNUP_TYPE"],
     data() {
         return {
             signUpDialog: false,
diff --git a/src/main/resources/views/platform/zhgh/activity/trainSignUp/manage/index.html b/src/main/resources/views/platform/zhgh/activity/trainSignUp/manage/index.html
index c73623d7..0366ed3f 100644
--- a/src/main/resources/views/platform/zhgh/activity/trainSignUp/manage/index.html
+++ b/src/main/resources/views/platform/zhgh/activity/trainSignUp/manage/index.html
@@ -123,7 +123,7 @@ layout("/layouts/platform.html"){
     new Vue({
         el: "#app",
         store,
-        dicts: ["CAMPUS", "TRAIN_SIGNUP_TYPE"],
+        dicts: ["USER_CAMPUS", "TRAIN_SIGNUP_TYPE"],
         mixins: [initTableMixins],
         components: {
             "info": info,
diff --git a/src/main/resources/views/platform/zhgh/staffmanage/sourcechange/manage/index.html b/src/main/resources/views/platform/zhgh/staffmanage/sourcechange/manage/index.html
index c4574941..78bc7b5a 100644
--- a/src/main/resources/views/platform/zhgh/staffmanage/sourcechange/manage/index.html
+++ b/src/main/resources/views/platform/zhgh/staffmanage/sourcechange/manage/index.html
@@ -82,8 +82,8 @@ layout("/layouts/platform.html"){
 						        v-for="item in changeTypeData"
 						        :key="item.code"
 						        :type="item.name"
-						        :effect="pageForm.changeTypes.includes(item.type)?'dark':'plain'"
-						        @click="tagClick('changeTypes',item.type)">
+						        :effect="pageForm.changeTypes.includes(item.code)?'dark':'plain'"
+						        @click="tagClick('changeTypes',item.code)">
 					        {{ item.changeTypeName }}
 				        </el-tag>
 				        <el-link type="danger"
@@ -302,6 +302,17 @@ layout("/layouts/platform.html"){
                 this.changeTypeData = await this.$businessTool.getEnumOptions("MemberChangeType")
 	            this.changeOriginData = await this.$businessTool.getEnumOptions("MemberChangeOrigin")
             },
+	        async pageData() {
+		        const pageForm = clone(this.pageForm)
+		        pageForm.changeTypes = JSON.stringify(this.pageForm.changeTypes)
+		        const resp = await $.post('/platform/sourcechange/manage/pageData', pageForm)
+		        if (resp.code === 0) {
+			        this.tableData = resp.data.list
+			        this.pageForm.totalCount = resp.data.totalCount
+		        } else {
+			        this.$message.warning(resp.msg)
+		        }
+	        }
         },
         async created() {
             await this.initData()