更新主键冲突策略

doc/部署说明/部署过程描述.md

@@ -38,7 +38,7 @@ Nginx 是源码编译安装的，安装在 `/usr/local/nginx/`，可执行文件
 * 备份数据库
   * 备份1期库（排除市监表）
     ```bash
-    mysqldump -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 --single-transaction --triggers --events --ignore-table=zfjd.sszt_jbxx110497_new --ignore-table=zfjd.sszt_jbxx110497 zfjd > /efcode20/dbv1/zfjd_2026_07_21_ex_sszt_jbxx_utf8.sql
+    mysqldump -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 --single-transaction --triggers --events --ignore-table=zfjd.sszt_jbxx110497_new --ignore-table=zfjd.sszt_jbxx110497 zfjd > /efcode20/dbv1/zfjd_2026_08_05_ex_sszt_jbxx_utf8.sql
     ```
   * 单独备份市监表
     ```bash
@@ -85,18 +85,21 @@ Nginx 是源码编译安装的，安装在 `/usr/local/nginx/`，可执行文件
   * 备份2期库
     * 查询字符集
       mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_prod -e "SELECT SCHEMA_NAME, DEFAULT_CHARACTER_SET_NAME, DEFAULT_COLLATION_NAME FROM information_schema.SCHEMATA WHERE SCHEMA_NAME='zfjd_ef20_1';"
+      mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_prod -e "SHOW CREATE TABLE zdxt_file\G"
+      mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_prod -e "select * from zdxt_file where org_code is not null;"
+      mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' zfjd -e "ALTER TABLE zdxt_file MODIFY COLUMN org_code varchar(100) NULL COMMENT '机构编号';"
       mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' -e "select count(*) from zfjd.sszt_jbxx110497_new"
-    * 备份1期库（排除市监表）
+    * 备份2期库（排除市监表）
     ```bash
     mysqldump -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 --single-transaction --triggers --events --ignore-table=zfjd_ef20_1.sszt_jbxx110497_new --ignore-table=zfjd_ef20_1.sszt_jbxx110497 zfjd_ef20_1 > /efcode20/dbv2/zfjd_ef20_1_2026_06_20_utf8.sql
-    mysqldump -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 --single-transaction --triggers --events zfjd_ef20_prod > /efcode20/dbv2/zfjd_ef20_prod_2026_07_30_utf8.sql
+    mysqldump -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 --single-transaction --triggers --events zfjd_ef20_prod > /efcode20/dbv2/zfjd_ef20_prod_2026_08_05_utf8.sql
     ```
   * 单独备份市监表
     ```bash
     mysqldump -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 --single-transaction --triggers --events zfjd_ef20_1 sszt_jbxx110497_new > /efcode20/dbv2/zfjd_ef20_1_2026_06_20_utf8_sszt_jbxx110497_new.sql
     ```
   * 压缩备份文件
-    zip -e -P 'xj.sdeweqwew222qwe.12345' /efcode20/dbv2/zfjd_ef20_prod_2026_07_30.zip /efcode20/dbv2/zfjd_ef20_prod_2026_07_30_utf8.sql
+    zip -e -P 'xj.sdeweqwew222qwe.12345' /efcode20/dbv2/zfjd_ef20_prod_2026_08_05_utf8.zip /efcode20/dbv2/zfjd_ef20_prod_2026_08_05_utf8.sql
   * 导入2期库
     ```
     mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_prod < /efcode20/dbv2/zfjd_ef20_1_2026_07_21_utf8.sql

zdxt-web-client/zdxt-admin-plus-ui/src/store/modules/permission.ts

@@ -28,7 +28,7 @@ export interface SystemCodeOption {
 export const CATCH_ALL_ROUTE_NAME = 'CatchAll404';
 //http://10.132.108.3:85/loginByUserId
 export const systemCodeOptions: SystemCodeOption[] = [
-  { label: '首页', value: 'planindex', icon: 'HomeFilled', iframeUrl: 'http://10.132.108.3:85/loginByUserId' },
+  { label: '首页', value: 'planindex', icon: 'HomeFilled', iframeUrl: 'http://Same-origin/loginByUserId' },
   { label: '执法监督码', value: 'supervisionCode', icon: 'Document' },
   { label: '后台管理', value: 'authService', icon: 'Setting' }
 ];
@@ -39,13 +39,18 @@ export const usePermissionStore = defineStore('permission', () => {
    */
   const buildIframeUrl = (baseUrl: string): string => {
     if (!baseUrl) return '';
+    // 当配置了 Same-origin 占位符时，替换为浏览器当前的 origin（协议+主机+端口）
+    let resolvedUrl = baseUrl;
+    if (baseUrl.includes('Same-origin')) {
+      resolvedUrl = baseUrl.replace('Same-origin', window.location.origin);
+    }
     const userStore = useUserStore();
     const params = new URLSearchParams();
     if (userStore.v1SystemCredential) {
       params.set('v1_system_credential', userStore.v1SystemCredential);
     }
-    const separator = baseUrl.includes('?') ? '&' : '?';
-    return baseUrl + separator + params.toString();
+    const separator = resolvedUrl.includes('?') ? '&' : '?';
+    return resolvedUrl + separator + params.toString();
   };
 
   const routes = ref<RouteRecordRaw[]>([]);

zdxt-web-server/zdxt-admin-web-server/src/main/resources/businessdatasyn/enterprise_pub_qrcode.json

@@ -13,7 +13,7 @@
       "area_name", "area_id", "street_name", "street_id",
       "matching_status", "matching_message", "download_status",
       "dept_name", "dept_id", "user_name", "user_id",
-      "create_time", "create_by", "qr_code_path", "last_qr_code_time",
+      "create_time", "qr_code_path", "last_qr_code_time",
       "import_row_num", "import_file_name", "import_file_id", "remark",
       "matching_to_type", "matching_to_id",
       "zone_dept_id", "zone_dept_name", "update_time"
@@ -30,7 +30,7 @@
       "area_name", "area_id", "street_name", "street_id",
       "matching_status", "matching_message", "download_status",
       "dept_name", "dept_id", "user_name", "user_id",
-      "create_time", "create_by", "qr_code_path", "last_qr_code_time",
+      "create_time", "qr_code_path", "last_qr_code_time",
       "import_row_num", "import_file_name", "import_file_id", "remark",
       "matching_to_type", "matching_to_id",
       "zone_dept_id", "zone_dept_name", "update_time",
@@ -55,7 +55,6 @@
     "user_name": "user_name",
     "user_id": "user_id",
     "create_time": "create_time",
-    "create_by": "create_by",
     "qr_code_path": "qr_code_path",
     "last_qr_code_time": "last_qr_code_time",
     "import_row_num": "import_row_num",