From 329bb646843c95133b20278f5cce24ec538fc653 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Mon, 25 May 2020 18:30:42 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8Dmybatis=E4=B8=8D=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81mysql=E6=B3=A8=E9=87=8A=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-user/epmet-user-server/deploy/docker-compose-dev.yml      | 2 +-
 epmet-user/epmet-user-server/pom.xml                            | 2 +-
 .../src/main/resources/mapper/GovStaffRoleDao.xml               | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
index da61c105a0..8f7f0cb065 100644
--- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
+++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.41
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.42
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络
diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml
index fe1d284fff..06587cfbad 100644
--- a/epmet-user/epmet-user-server/pom.xml
+++ b/epmet-user/epmet-user-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.41</version>
+    <version>0.3.42</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml
index dc00fb859e..5788da7ba8 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml
@@ -38,7 +38,6 @@
         where
             DEL_FLAG = '0'
         AND CUSTOMER_ID = #{customerId}
---         AND ORG_TYPE = 'agency'
         ORDER BY SORT ASC
     </select>