From c36ee11405fd39aa7608d667406b5519fcbdca8f Mon Sep 17 00:00:00 2001
From: baohanddd <baohanddd@gmail.com>
Date: Sat, 30 Apr 2016 20:39:15 +0800
Subject: [PATCH] =?UTF-8?q?add=20data=20import=20:=E6=9C=BA=E6=9E=84?=
 =?UTF-8?q?=E3=80=81=E9=83=A8=E9=97=A8=E3=80=81=E7=94=A8=E6=88=B7(?=
 =?UTF-8?q?=E5=8C=BB=E7=94=9F)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 platform-biz-service/src/main/resources/mainOrm/Users.xml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/platform-biz-service/src/main/resources/mainOrm/Users.xml b/platform-biz-service/src/main/resources/mainOrm/Users.xml
index 1849b32..25a260b 100644
--- a/platform-biz-service/src/main/resources/mainOrm/Users.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/Users.xml
@@ -218,7 +218,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}
@@ -235,23 +234,22 @@ select id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,p
         <if test="keyword != null and keyword != ''">
             and name like CONCAT(#{keyword}, '%')
         </if>
-        <if test="ksId != null">
+        <if test="ksId != null and ksId != ''">
             and u.ks_id = #{ksId,jdbcType=INTEGER}
         </if>
-        <if test="orgId != null">
+        <if test="orgId != null and orgId != ''">
             and u.org_id = #{orgId,jdbcType=INTEGER}
         </if>
-        <if test="deptId != null">
+        <if test="deptId != null and deptId != ''">
             and u.dept_id = #{deptId,jdbcType=INTEGER}
         </if>
-        <if test="roleId != null">
+        <if test="roleId != null and roleId != ''">
             and ur.role_id = #{roleId,jdbcType=INTEGER}
         </if>
-        <if test="yn != null">
+        <if test="yn != null and yn != ''">
             and u.yn = #{yn,jdbcType=INTEGER}
-            --             and ur.yn = #{yn,jdbcType=INTEGER}
         </if>
-        <if test="type != null">
+        <if test="type != null and type != ''">
             and u.type = #{type,jdbcType=INTEGER}
         </if>
     </select>
-- 
1.8.3.1