diff --git a/pom.xml b/pom.xml index bbd39da..09d7345 100644 --- a/pom.xml +++ b/pom.xml @@ -221,6 +221,7 @@ org.springframework.boot spring-boot-maven-plugin + 2.2.6.RELEASE 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 - (and t4.rol_id = 1 or t4.role_id = 3) + and t4.role_id in (1,3) - (and t4.role_id = 2) + and t4.role_id = 2 and t2.id = #{id}