From 062436ea82f3c643adbb7efe7e7f531d4e041aeb Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Tue, 25 Oct 2016 17:43:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=A7=E6=9C=BA=E5=8F=B7=20=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 platform-biz-service/src/main/resources/mainOrm/master/MasterUsers.xml | 1 -
 platform-biz-service/src/main/resources/mainOrm/slave/Users.xml        | 1 -
 2 files changed, 2 deletions(-)

diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterUsers.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterUsers.xml
index 599d369..3cb03e5 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/MasterUsers.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterUsers.xml
@@ -254,7 +254,6 @@ select id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,p
         </if>
         <if test="yn != null">
             and u.yn = #{yn,jdbcType=INTEGER}
-            and ur.yn = #{yn,jdbcType=INTEGER}
         </if>
         <if test="type != null">
             and u.type = #{type,jdbcType=INTEGER}
diff --git a/platform-biz-service/src/main/resources/mainOrm/slave/Users.xml b/platform-biz-service/src/main/resources/mainOrm/slave/Users.xml
index 22b2f3b..f663a11 100644
--- a/platform-biz-service/src/main/resources/mainOrm/slave/Users.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/slave/Users.xml
@@ -251,7 +251,6 @@ select id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,p
         </if>
         <if test="yn != null">
             and u.yn = #{yn,jdbcType=INTEGER}
-            and ur.yn = #{yn,jdbcType=INTEGER}
         </if>
         <if test="type != null">
             and u.type = #{type,jdbcType=INTEGER}
-- 
1.8.3.1