From 07c81b8e2e52290f7f83284f437ce85fab632086 Mon Sep 17 00:00:00 2001
From: "rui.zhang" <zhangrui@lymsh.com>
Date: Thu, 5 May 2016 17:43:13 +0800
Subject: [PATCH] =?UTF-8?q?platform=20permission=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=E7=94=A8=E6=88=B7=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/permission/model/UsersQuery.java    |  1 -
 platform-biz-service/src/main/resources/mainOrm/Users.xml      | 10 ++++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java
index f8e43a8..7439f43 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java
@@ -30,7 +30,6 @@ public class UsersQuery extends BaseQuery {
     private Integer roleId;
     private String foreignId;
     private Integer otherAccount;   //第三方帐号, 1医院帐号
-
     public Integer getOtherAccount() {
         return otherAccount;
     }
diff --git a/platform-biz-service/src/main/resources/mainOrm/Users.xml b/platform-biz-service/src/main/resources/mainOrm/Users.xml
index ad4b6d6..b8d5b9f 100644
--- a/platform-biz-service/src/main/resources/mainOrm/Users.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/Users.xml
@@ -181,7 +181,7 @@ select id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,p
             <if test="lastLoginTime != null">
                 and last_login_time = #{lastLoginTime,jdbcType=TIMESTAMP}
             </if>
-            <if test="other_account != null and other_account >= 0">
+            <if test="otherAccount != null and otherAccount >= 0">
                 and other_account = #{otherAccount,jdbcType=INTEGER}
             </if>
         </where>
@@ -191,7 +191,7 @@ select id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,p
     <select id="queryUsers" resultMap="UsersResultMap" parameterType="com.lyms.platform.permission.model.UsersQuery">
         select
         id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,publish_name,yn,enable,modified,created,remarks,last_login_time,
-        ks_id,foreign_id,otherAccount
+        ks_id,foreign_id,other_account
         from users
         <include refid="UsersCondition"/>
         <include refid="orderAndLimit"/>
@@ -226,6 +226,9 @@ select id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,p
         <if test="type != null">
             and u.type = #{type,jdbcType=INTEGER}
         </if>
+        <if test="otherAccount != null">
+            and u.other_account = #{otherAccount,jdbcType=INTEGER}
+        </if>
         <include refid="orderAndLimit"/>
     </select>
 
@@ -256,6 +259,9 @@ select id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,p
         <if test="type != null ">
             and u.type = #{type,jdbcType=INTEGER}
         </if>
+        <if test="otherAccount != null">
+            and u.other_account = #{otherAccount,jdbcType=INTEGER}
+        </if>
     </select>
 
 
-- 
1.8.3.1