From befd16cc440940aef8ac48df70312512b1e1482a Mon Sep 17 00:00:00 2001
From: tuyp <tuyaping@ykhl.com>
Date: Wed, 9 Mar 2022 14:33:16 +0800
Subject: [PATCH] 签到数据删除了历史数据

---
 pom.xml                                         | 1 +
 src/main/resources/application.properties       | 4 ++--
 src/main/resources/mapper/CompanyDictMapper.xml | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index bbd39da..09d7345 100644
--- a/pom.xml
+++ b/pom.xml
@@ -221,6 +221,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.2.6.RELEASE</version>
                 <configuration>
                     <excludes>
                         <exclude>
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 37ce64a..a62a220 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,7 +1,7 @@
 # 环境配置
-spring.profiles.active=prod
+spring.profiles.active=dev
 # 端口号
-spring.server.port=23459
+spring.server.port=23457
 #嵌入tomcat配置
 #和CPU数
 spring.server.acceptorThreadCount=600
diff --git a/src/main/resources/mapper/CompanyDictMapper.xml b/src/main/resources/mapper/CompanyDictMapper.xml
index fd74fe5..5c76650 100644
--- a/src/main/resources/mapper/CompanyDictMapper.xml
+++ b/src/main/resources/mapper/CompanyDictMapper.xml
@@ -42,10 +42,10 @@
             and t2.delete_date is null
             and t3.delete_date is null
             <if test="role == 1">
-                (and t4.rol_id = 1 or t4.role_id = 3)
+                and t4.role_id in (1,3)
             </if>
             <if test="role == 2">
-                (and t4.role_id = 2)
+                and t4.role_id = 2
             </if>
             <if test="id != null and id != ''">
                 and t2.id = #{id}
--
libgit2 0.25.0