From 4875c14ef806522b09237ab0454ab8e249000a6b Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 5 Jan 2022 17:24:58 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=9A=E5=91=98=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/member/mapper/xml/TbMemberProjectMapper.xml | 1 +
 .../jero/member/service/impl/TbMemberProjectServiceImpl.java  | 4 +++-
 jero-boot-single-startup/src/main/resources/spy.properties    | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectMapper.xml
index 1507d80b..2badaa4c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectMapper.xml
@@ -13,6 +13,7 @@
     <select id="queryPageList" resultMap="TbMemberProjectResultMap">
         select distinct tmp.* from tb_member_project tmp
             left join pay_meeting pm on tmp.id = pm.standards_id
+            left join pay_meeting_contacts pmc on pm.id = pmc.meeting_id
         ${ew.customSqlSegment}
     </select>
 </mapper>
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbMemberProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbMemberProjectServiceImpl.java
index 925c5055..d48b9052 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbMemberProjectServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbMemberProjectServiceImpl.java
@@ -113,10 +113,12 @@ public class TbMemberProjectServiceImpl extends ServiceImpl<TbMemberProjectMappe
     public IPage<TbMemberProject> queryPageList(Page<TbMemberProject> page, QueryWrapper<TbMemberProject> queryWrapper) {
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		if (!rolePermissionService.getRolePermission("stardsMember:search")) {
-			queryWrapper.or(
+			queryWrapper.and(
 					a -> a.eq("pm.director_id",sysUser.getId())
 							.or()
 							.eq("tmp.director_id",sysUser.getId())
+							.or()
+							.eq("pmc.meeting_contacts_id", sysUser.getId())
 			);
 		}
         return baseMapper.queryPageList(page,queryWrapper);
diff --git a/jero-boot-single-startup/src/main/resources/spy.properties b/jero-boot-single-startup/src/main/resources/spy.properties
index 0eb3c57d..b8c7f308 100644
--- a/jero-boot-single-startup/src/main/resources/spy.properties
+++ b/jero-boot-single-startup/src/main/resources/spy.properties
@@ -5,12 +5,13 @@ appender=com.p6spy.engine.spy.appender.Slf4JLogger
 filter=true
 ## 过滤 Log 时所排除的表名列表,以逗号分隔。
 exclude=QRTZ_SCHEDULER_STATE,QRTZ_TRIGGERS,QRTZ_LOCKS,QRTZ_FIRED_TRIGGERS,dual
-## 配置记录Log例外
+## 配置记录Log例外,可去掉的结果集有error,info,batch,debug,statement,commit,rollback,result,resultset.
 excludecategories=info,debug,result,commit,resultset
 # 设置使用p6spy driver来做代理
 deregisterdrivers=true
 # 日期格式
 dateformat=yyyy-MM-dd HH:mm:ss
+databaseDialectTimestampFormat = yyyy-MM-dd HH:mm:ss
 # 实际驱动
 driverlist=com.mysql.cj.jdbc.Driver
 # 是否开启慢SQL记录