From 98fdc480952abd61e392cf7b18bd3a7a29c4f6e4 Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Tue, 19 May 2026 14:45:21 +0800
Subject: [PATCH] =?UTF-8?q?config(start):=20=E6=9B=B4=E6=96=B0=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=20fix(infrastructure):=20=E9=9A=90=E6=82=A3=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=98=A0=E5=B0=84=E5=99=A8=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 start/src/main/resources/bootstrap.yml        |  6 ++-
 start/src/main/resources/nacos-prod-gwj.yml   | 42 +++++++++++++++
 start/src/main/resources/sdk-prod-gwj.yml     | 51 +++++++++++++++++++
 .../mapper/HiddenEvaluationRecordMapper.xml   |  1 +
 4 files changed, 98 insertions(+), 2 deletions(-)
 create mode 100644 start/src/main/resources/nacos-prod-gwj.yml
 create mode 100644 start/src/main/resources/sdk-prod-gwj.yml

diff --git a/start/src/main/resources/bootstrap.yml b/start/src/main/resources/bootstrap.yml
index c1f3602..b922a66 100644
--- a/start/src/main/resources/bootstrap.yml
+++ b/start/src/main/resources/bootstrap.yml
@@ -3,6 +3,8 @@ spring:
     import:
 #      - classpath:nacos.yml
 #      - classpath:sdk.yml
-      - classpath:nacos-prod.yml
-      - classpath:sdk-prod.yml
+#      - classpath:nacos-prod.yml
+#      - classpath:sdk-prod.yml
+      - classpath:nacos-prod-gwj.yml
+      - classpath:sdk-prod-gwj.yml
       - classpath:swagger.yml
diff --git a/start/src/main/resources/nacos-prod-gwj.yml b/start/src/main/resources/nacos-prod-gwj.yml
new file mode 100644
index 0000000..525f386
--- /dev/null
+++ b/start/src/main/resources/nacos-prod-gwj.yml
@@ -0,0 +1,42 @@
+nacos:
+  url: prod-nacos:8848
+  namespace: jjb-dragon
+application:
+  name: jjb-saas-zcloud-hidden-evaluation
+  version:
+  gateway: hiddenEvaluation
+  cn-name: 隐患考评
+spring:
+  application:
+    name: ${application.name}${application.version}
+  profiles:
+    # 环境配置
+    active: test
+  cloud:
+    nacos:
+      config:
+        username: nacos
+        password: u9Hc7tLFBY
+        namespace: ${nacos.namespace}
+        server-addr: ${nacos.url}
+        file-extension: yml
+        shared-configs:
+          - config-common.yml
+          - config-port.yml
+          - config-mq.yml
+          - config-log.yml
+          - config-sdk-server.yml
+          - config-actuator.yml
+          - config-job.yml
+          - config-mysql.yml
+          - config-redis.yml
+          - config-cache.yml
+          - config-spring.yml
+          - config-mybatis.yml
+          - config-sdk.yml
+          - config-flyway.yml
+      discovery:
+        server-addr: ${spring.cloud.nacos.config.server-addr}
+        namespace: ${spring.cloud.nacos.config.namespace}
+        username: nacos
+        password: u9Hc7tLFBY
diff --git a/start/src/main/resources/sdk-prod-gwj.yml b/start/src/main/resources/sdk-prod-gwj.yml
new file mode 100644
index 0000000..82faa26
--- /dev/null
+++ b/start/src/main/resources/sdk-prod-gwj.yml
@@ -0,0 +1,51 @@
+sdk:
+  server:
+    app-key: bbc138a9447d45ba8ceffd871e47d1bd
+  client:
+    gateway:
+      url: ${common.gateway.network.http.external}
+      route:
+        - client:
+            system-code: ${application.name}
+            name: ${application.cn-name}-后端
+            group-code: public_api
+          service:
+            system-code: ${application.name}
+            name: ${application.cn-name}-后端
+            group-code: public_api
+            strip-prefix: 0
+            uri: http://${application.name}
+            path: /${application.gateway}/**
+        - client:
+            system-code: ${application.name}-container
+            name: ${application.cn-name}-前端
+            group-code: public_api
+          service:
+            system-code: ${application.name}-container
+            name: ${application.cn-name}-前端
+            group-code: public_api
+            strip-prefix: 0
+            uri: http://jjb-saas-base
+            path: /${application.gateway}/container/**
+            order: -2
+openapi:
+  appId: 1871106785124999168
+  appKey: 7314ecfc11ff4d5fad1ac19284ed2ac3
+  appSecret: 7565ab15-a2ae-4830-9b4d-fb382cd5fb30
+  appPublicKey: 3059301306072a8648ce3d020106082a811ccf5501822d03420004f339671110a06681fcfd968ad9247bd3cd0d2ec6b2159d1d4b775e7ed5566b3297d82cf14b626ef11fdd6bc7ecb6bcfb3ea94ccd1f381f4116f43367be4b360f
+  appPrivateKey: 308193020100301306072a8648ce3d020106082a811ccf5501822d0479307702010104206b6abc8e717b7d042f1e8531190a7c18113e4a701417f2770d2150d33ba97779a00a06082a811ccf5501822da14403420004f339671110a06681fcfd968ad9247bd3cd0d2ec6b2159d1d4b775e7ed5566b3297d82cf14b626ef11fdd6bc7ecb6bcfb3ea94ccd1f381f4116f43367be4b360f
+  encryptType: SM2
+  platform:
+    - name: default
+      openPublicKey: 3059301306072a8648ce3d020106082a811ccf5501822d034200045b5d8fcad91e113910406db4caf0f5c6688048e0f46742d55f872a25855316803ddb177cc9bb5906ff0b2ad4d6b1f1378a49109104613e79b5b5512e3710e88f
+      url: ${common.gateway.network.http.intranet}
+      protocol: HTTP
+      defaultPlatform: true
+      ##ciphertext plaintext
+      type: plaintext
+  apiPlatform:
+    - name: default
+      #多个可以逗号隔开
+      apiCode: test:01
+      #多个可以逗号隔开，可以为空
+      tenantIds: 1838408702262321152
diff --git a/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml
index 6f702cb..2ea5dae 100644
--- a/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml
@@ -281,6 +281,7 @@
                        ON ecConfig.department_id = configDept.id
              LEFT JOIN user configUser
                        ON ecConfig.user_id = configUser.id
+	        LEFT JOIN evaluation_config ec ON ec.corpinfo_id = ci.id AND ec.delete_enum = 'FALSE'
     WHERE ci.delete_enum = 'FALSE'
       AND ci.use_flag = 1
       AND (