From 684c088d56a6421ba4c2fd72a7bc00bf30663a52 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Wed, 6 Mar 2024 22:43:19 +0800
Subject: [PATCH] update code

---
 ruoyi-admin/src/main/resources/application-druid.yml            | 2 +-
 ruoyi-admin/src/main/resources/application.yml                  | 2 +-
 .../main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 0a4cb247..df613172 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -40,7 +40,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://cd-cynosdbmysql-grp-9rqrhxsm.sql.tencentcdb.com:27981/yanzhu_jh_test?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
+                url: jdbc:mysql://cd-cynosdbmysql-grp-9rqrhxsm.sql.tencentcdb.com:27981/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
                 username: root
                 password: Sxyanzhu@cf
             # 从库数据源
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index dbbc4084..f449f345 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -20,7 +20,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: prod
+    active: druid
   # 文件上传
   servlet:
     multipart:
diff --git a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
index b76b5655..8c05417d 100644
--- a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
@@ -622,7 +622,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM sys_user u,sur_project_userinfo p WHERE u.user_id=p.user_id AND p.dept_type=2
         ) sp on ssp.lordSentUser = sp.phonenumber
         <!--监理单位/总包公司/分包单位-->
-        <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = sp.id</if>
+        <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = ssp.projectId</if>
         <where>
             and ssp.isDel=0
             <if test="projectId != null "> and ssp.projectId = #{projectId}</if>