From adb0b00a5e6d3c4636bcf7fd7ace2aa71cd671ec Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期二, 11 十月 2022 15:24:09 +0800
Subject: [PATCH] 修改Bug
---
flower_city/src/main/resources/application.properties | 6 +++---
flower_city/src/main/resources/mapper/SysUserMapper.xml | 4 +++-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/flower_city/src/main/resources/application.properties b/flower_city/src/main/resources/application.properties
index c0a6326..54249ae 100644
--- a/flower_city/src/main/resources/application.properties
+++ b/flower_city/src/main/resources/application.properties
@@ -3,8 +3,8 @@
spring.datasource.password=nahanMysqlPwd&&RemoteRemote2019nahan
#spring.datasource.url=jdbc:mysql://10.8.0.74:3306/flower_city_automessage?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&allowMultiQueries=true&serverTimezone=GMT%2B8
#spring.datasource.url=jdbc:mysql://localhost:3306/flower_city_automessage?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&allowMultiQueries=true&serverTimezone=GMT%2B8
-spring.datasource.url=jdbc:mysql://10.8.0.74:3306/huacheng_smart_life?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&allowMultiQueries=true&serverTimezone=GMT%2B8
-#spring.datasource.url=jdbc:mysql://182.151.2.19:3306/huacheng_smart_life?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+#spring.datasource.url=jdbc:mysql://10.8.0.74:3306/huacheng_smart_life?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&allowMultiQueries=true&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://182.151.2.19:3306/huacheng_smart_life?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
server.port=8187
@@ -15,7 +15,7 @@
#Redis
spring.redis.host=127.0.0.1
spring.redis.port=6379
-#spring.redis.password=nahanRedisPwsIsVerySimple&&
+spring.redis.password=nahanRedisPwsIsVerySimple&&
diff --git a/flower_city/src/main/resources/mapper/SysUserMapper.xml b/flower_city/src/main/resources/mapper/SysUserMapper.xml
index a4ed940..ae29bfb 100644
--- a/flower_city/src/main/resources/mapper/SysUserMapper.xml
+++ b/flower_city/src/main/resources/mapper/SysUserMapper.xml
@@ -72,6 +72,7 @@
transaction_ids,
transaction_names,
openid,
+ transaction_num,
(select organization_name from automessage_organization_chart where automessage_sys_user.department_id=automessage_organization_chart.id) as department_name
FROM
automessage_sys_user
@@ -122,8 +123,9 @@
<select id="selectListByDepartmentId" resultMap="SysUserResult">
<include refid="selectSysUserVo"/>
<where>
+ user_type=2
<if test="list!=null">
- department_id in
+ and department_id in
<foreach collection="list" item="id" index="index" open="(" close=")" separator=",">
#{id}
</foreach>
--
Gitblit v1.7.1