From 99c8f4d4b5e262eba8c4b5a416e76203207b7c30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E9=94=90=E6=B3=A2?=
 <10549902+zhuangruibo@user.noreply.gitee.com>
Date: Tue, 9 Jun 2026 20:15:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=9D=A3=E7=AB=AF-=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../013-计划任务表设计.sql             |   5 +++--
 .../domain/EnterpriseInformation.java         |   4 ++--
 .../service/IEfcodeCpSettingService.java      |  21 ++++++++++++++++--
 .../service/impl/EfcodeCpPlanServiceImpl.java |   4 ++--
 .../impl/EfcodeCpSettingServiceImpl.java      |  10 ++++++++-
 .../zdxt-admin-plus-ui/src/views/login.vue    |   2 ++
 .../src/assets/images/defaultAvatar.png       | Bin 0 -> 10685 bytes
 .../views/enforcement/my/enforcementMy.vue    |  16 ++++++++-----
 .../enterprise/home/enterpriseHomeV2.vue      |   3 ++-
 .../service/test/ResetUserPasswordTest.java   |   2 +-
 10 files changed, 51 insertions(+), 16 deletions(-)
 create mode 100644 zdxt-web-client/zdxt-efcode-enforcement-app/src/assets/images/defaultAvatar.png

diff --git a/script/sql/zfjd-refactoring-v1/013-计划任务表设计.sql b/script/sql/zfjd-refactoring-v1/013-计划任务表设计.sql
index 3592e490..d03ab4c1 100644
--- a/script/sql/zfjd-refactoring-v1/013-计划任务表设计.sql
+++ b/script/sql/zfjd-refactoring-v1/013-计划任务表设计.sql
@@ -211,11 +211,12 @@ CREATE TABLE `efcode_cp_log`
 /*初始化数据*/
 INSERT INTO `efcode_cp_setting` (`id`, `setting_name`, `setting_value`, `remark`, `create_by`, `create_dept`)
 VALUES ('CP_SETTING_SUBMIT_DEADLINE', '下阶段计划提交最晚时间', '26', '每月几号前需提交下阶段计划<=26号', '0', '0'),
-       ('CP_SETTING_AUTO_MATCH_START', '系统自动推荐匹配开始时间', '27', '系统自动推荐匹配的开始时间(号)=27号', '0', '0'),
+       ('CP_SETTING_AUTO_MATCH_START', '系统自动推荐匹配开始时间', '26', '系统自动推荐匹配的开始时间(号)=26号', '0', '0'),
        ('CP_SETTING_RESERVE_CANCEL_DURATION', '预约自动取消时长', '14', '发起预约后,如果多长时间没有处理,则自动取消,14天',
         '0', '0'),
        ('CP_SETTING_MANUAL_MATCH_DAYS', '手工匹配距计划开始天数', '3', '手工匹配距离计划开始的天数>=3天,同时,距离计划开始的第3天,系统自动去掉这些计划的预约,同时转化为任务', '0', '0'),
-       ('CP_MAX_UNION_UNIT', '单次联合单位最大数量', '3', '单次联合单位最大数量<=3个执法单位', '0', '0'),
+       ('CP_MAX_UNION_UNIT', '获取单次手动联合单位最大数量', '2', '获取单次手动联合单位最大数量<=2个执法单位', '0', '0'),
+       ('CP_MAX_AUTO_MATCH_UNION_UNIT', '获取单次系统联合单位最大数量', '3', '获取单次系统联合单位最大数量<=3个执法单位', '0', '0'),
        ('CP_MAX_INNER_UNIT_AC_PERSON_NUM', '单位内部单次计划最多参与人数', '3', '单位内部单次计划最多参与人数<=3人', '0',
         '0'),
        ('CP_SETTING_SYSTEM_MATCH_WEEKS', '系统匹配预约周数范围', '1', '系统匹配时向后查找的周数范围1周:可选1,2,3,4周',
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseInformation.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseInformation.java
index 6cf66419..afe8cbb6 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseInformation.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseInformation.java
@@ -34,13 +34,13 @@ public class EnterpriseInformation extends BaseEntity {
     /**
      * 覆盖父类字段: 数据库中create_by存储的是人名字符串而非用户ID，跳过查询避免类型转换异常
      */
-    @TableField(value = "create_by", fill = FieldFill.INSERT)
+    @TableField(value = "create_by", select = false, fill = FieldFill.INSERT)
     private Long createBy;
 
     /**
      * 覆盖父类字段: 数据库中update_by存储的是人名字符串而非用户ID，跳过查询避免类型转换异常
      */
-    @TableField(value = "update_by", fill = FieldFill.INSERT_UPDATE)
+    @TableField(value = "update_by", select = false, fill = FieldFill.INSERT_UPDATE)
     private Long updateBy;
 
     /**
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpSettingService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpSettingService.java
index 9c176fbd..b8a74a54 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpSettingService.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpSettingService.java
@@ -32,10 +32,15 @@ public interface IEfcodeCpSettingService {
     String SETTING_ID_MANUAL_MATCH_DAYS = "CP_SETTING_MANUAL_MATCH_DAYS";
 
     /**
-     * 设置项主键：单次联合单位最大数量<=3
+     * 设置项主键：获取单次手动联合单位最大数量<=3
      */
     String SETTING_ID_MAX_UNION_UNIT = "CP_MAX_UNION_UNIT";
 
+    /**
+     * 设置项主键：获取单次系统联合单位最大数量<=3
+     */
+    String SETTING_ID_MAX_AUTO_MATCH_UNION_UNIT = "CP_MAX_AUTO_MATCH_UNION_UNIT";
+
     /**
      * 设置项主键：单位内部单次计划最多参与人数<=3
      */
@@ -67,10 +72,15 @@ public interface IEfcodeCpSettingService {
     int DEFAULT_MANUAL_MATCH_DAYS = 3;
 
     /**
-     * 默认值：单次联合单位最大数量
+     * 默认值：获取单次手动联合单位最大数量
      */
     int DEFAULT_MAX_UNION_UNIT = 3;
 
+    /**
+     * 默认值：获取单次系统联合单位最大数量
+     */
+    int DEFAULT_MAX_AUTO_MATCH_UNION_UNIT = 3;
+
     /**
      * 默认值：单位内部单次计划最多参与人数
      */
@@ -122,6 +132,13 @@ public interface IEfcodeCpSettingService {
      */
     Integer getMaxUnionUnit();
 
+    /**
+     * 获取单次系统联合单位最大数量
+     *
+     * @return 数值，未配置或无法解析时返回默认值 {@link #DEFAULT_MAX_AUTO_MATCH_UNION_UNIT}
+     */
+    Integer getMaxAutoMatchUnionUnit();
+
     /**
      * 获取单位内部单次计划最多参与人数
      *
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpPlanServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpPlanServiceImpl.java
index 81efa1d7..581cbad0 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpPlanServiceImpl.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpPlanServiceImpl.java
@@ -603,7 +603,7 @@ public class EfcodeCpPlanServiceImpl implements IEfcodeCpPlanService {
         }
 
         // 2. 获取最大联合单位数量
-        int maxUnionUnit = cpSettingService.getMaxUnionUnit();
+        int maxAutoMatchUnionUnit = cpSettingService.getMaxAutoMatchUnionUnit();
 
         // 3. 查询待匹配的计划：plan_date > 当前时间 且 system_reserved=0, reserve_status=1, is_public=1, is_union=1
         Date now = new Date();
@@ -667,7 +667,7 @@ public class EfcodeCpPlanServiceImpl implements IEfcodeCpPlanService {
                     distinctUnitPlans.add(sp);
                 }
                 // 限制最大联合数量
-                if (distinctUnitPlans.size() >= maxUnionUnit) {
+                if (distinctUnitPlans.size() >= maxAutoMatchUnionUnit) {
                     break;
                 }
             }
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpSettingServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpSettingServiceImpl.java
index b8d6d590..8a36750c 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpSettingServiceImpl.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpSettingServiceImpl.java
@@ -69,13 +69,21 @@ public class EfcodeCpSettingServiceImpl implements IEfcodeCpSettingService {
     }
 
     /**
-     * 获取单次联合单位最大数量
+     * 获取单次手动联合单位最大数量
      */
     @Override
     public Integer getMaxUnionUnit() {
         return getIntSetting(SETTING_ID_MAX_UNION_UNIT, DEFAULT_MAX_UNION_UNIT);
     }
 
+    /**
+     * 获取单次系统联合单位最大数量
+     */
+    @Override
+    public Integer getMaxAutoMatchUnionUnit() {
+        return getIntSetting(SETTING_ID_MAX_AUTO_MATCH_UNION_UNIT, DEFAULT_MAX_AUTO_MATCH_UNION_UNIT);
+    }
+
     /**
      * 获取单位内部单次计划最多参与人数
      */
diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/views/login.vue b/zdxt-web-client/zdxt-admin-plus-ui/src/views/login.vue
index 6ed532c9..fe577c5e 100644
--- a/zdxt-web-client/zdxt-admin-plus-ui/src/views/login.vue
+++ b/zdxt-web-client/zdxt-admin-plus-ui/src/views/login.vue
@@ -154,6 +154,8 @@ interface TestUser {
 
 const testUsers = ref<TestUser[]>([
   { label: '超级管理员', tenantId: '000000', username: 'admin', password: 'szsf@zfjd' },
+  { label: '深圳市司法局-刘倩琳', tenantId: '000000', username: 'liuqianlin', password: 'szsf@zfjd' },
+  { label: '深圳市审计局-杜啟艺', tenantId: '000000', username: 'duqiyi', password: 'szsf@zfjd' },
   { label: '深圳市龙岗区司法局-黄占海', tenantId: '000000', username: 'huangzhanhai', password: 'szsf@zfjd' },
   { label: '深圳市南山区司法局-梁有志', tenantId: '000000', username: 'liangyouzhi', password: 'szsf@zfjd' },
   { label: '深圳市坪山区司法局-李旺', tenantId: '000000', username: 'liwang4', password: 'szsf@zfjd' },
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/assets/images/defaultAvatar.png b/zdxt-web-client/zdxt-efcode-enforcement-app/src/assets/images/defaultAvatar.png
new file mode 100644
index 0000000000000000000000000000000000000000..ceafb4fa78fe8c9cb0336f1f984ecf35911c0e12
GIT binary patch
literal 10685
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
ah64dy#G7r$TGdUORJ4|%X316i$NvLBeojgN

literal 0
HcmV?d00001

diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/enforcementMy.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/enforcementMy.vue
index 9e8ec466..85202482 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/enforcementMy.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/enforcementMy.vue
@@ -68,12 +68,13 @@ import { showToast } from 'vant';
 const router = useRouter();
 
 // ========== 用户信息 ==========
-const defaultAvatar = 'https://img.yzcdn.cn/vant/cat.jpeg';
-const userInfo = ref({
-    name: '司小华',
-    phone: '13800138000',
+const defaultAvatar = new URL('@/assets/images/defaultAvatar.png', import.meta.url).href;
+const commonStore = $globalStore.useCommon;
+const userInfo = computed(() => ({
+    name: commonStore.nickName || commonStore.userName || '未登录',
+    phone: commonStore.phonenumber || '',
     avatar: defaultAvatar,
-});
+}));
 
 const onAvatarError = (e) => {
     e.target.src = defaultAvatar;
@@ -215,6 +216,9 @@ const onMenuClick = (item) => {
         border: 3px solid rgba(255, 255, 255, 0.9);
         box-shadow: 0 4px 14px rgba(0, 0, 0, 0.12);
         background: #fff;
+        display: flex;
+        align-items: center;
+        justify-content: center;
 
         img {
             width: 100%;
@@ -228,6 +232,7 @@ const onMenuClick = (item) => {
         font-weight: 700;
         color: #fff;
         letter-spacing: 2px;
+        text-align: center;
         text-shadow: 0 1px 3px rgba(0, 0, 0, 0.12);
     }
 
@@ -235,6 +240,7 @@ const onMenuClick = (item) => {
         font-size: 13px;
         color: rgba(255, 255, 255, 0.9);
         letter-spacing: 1px;
+        text-align: center;
     }
 }
 
diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/home/enterpriseHomeV2.vue b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/home/enterpriseHomeV2.vue
index 6618ccdb..746e25ae 100644
--- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/home/enterpriseHomeV2.vue
+++ b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/home/enterpriseHomeV2.vue
@@ -202,6 +202,7 @@ const hasUserInfo = () => {
 };
 
 onMounted(() => {
+    //debugger;
     console.log(useCommon.firstLoad);
     console.log(useCommon);
     isLoading.value = useCommon.firstLoad;
@@ -437,7 +438,7 @@ onMounted(() => {
         padding: 0 !important;
         font-size: 14px;
     }
-    
+
     .notice-text {
         font-size: 14px;
         color: #8c8c8c;
diff --git a/zdxt-web-server/zdxt-admin-web-server/src/test/java/com/zdxt/service/test/ResetUserPasswordTest.java b/zdxt-web-server/zdxt-admin-web-server/src/test/java/com/zdxt/service/test/ResetUserPasswordTest.java
index bb73501e..ab6c3e68 100644
--- a/zdxt-web-server/zdxt-admin-web-server/src/test/java/com/zdxt/service/test/ResetUserPasswordTest.java
+++ b/zdxt-web-server/zdxt-admin-web-server/src/test/java/com/zdxt/service/test/ResetUserPasswordTest.java
@@ -170,7 +170,7 @@ public class ResetUserPasswordTest {
         // 监督端的报表测试用户
         userIds = Arrays.asList(
             // TODO: 在此填入需要重置的用户ID
-            17608417340L, 17608417451L,17608417716L, 17608614169L,17608614499L
+            17608417340L, 17608417451L,17608417716L, 17608614169L,17608614499L,7897L,17608634290L
         );
 
         // 2. 根据ID列表查询系统用户