jiangjiazhi / regional-platform

Authored by jiangjiazhi over 9 years ago

Exists in master and in 8 other branches

# Conflicts:
#	platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java

Showing 2 changed files

...	...	@@ -29,8 +29,7 @@
29	29	private String keyword;
30	30	private Integer roleId;
31	31	private String foreignId;
32		- private Integer otherAccount;
33		-
	32	+ private Integer otherAccount; //µÚÈý·½ÕÊºÅ, 1Ò½ÔºÕÊºÅ
34	33	public Integer getOtherAccount() {
35	34	return otherAccount;
36	35	}

...	...	@@ -181,7 +181,7 @@
181	181	<if test="lastLoginTime != null">
182	182	and last_login_time = #{lastLoginTime,jdbcType=TIMESTAMP}
183	183	</if>
184		- <if test="other_account != null and other_account >= 0">
	184	+ <if test="otherAccount != null and otherAccount >= 0">
185	185	and other_account = #{otherAccount,jdbcType=INTEGER}
186	186	</if>
187	187	</where>
...	...	@@ -191,7 +191,7 @@
191	191	<select id="queryUsers" resultMap="UsersResultMap" parameterType="com.lyms.platform.permission.model.UsersQuery">
192	192	select
193	193	id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,publish_name,yn,enable,modified,created,remarks,last_login_time,
194		- ks_id,foreign_id,otherAccount
	194	+ ks_id,foreign_id,other_account
195	195	from users
196	196	<include refid="UsersCondition"/>
197	197	<include refid="orderAndLimit"/>
...	...	@@ -226,6 +226,9 @@
226	226	<if test="type != null">
227	227	and u.type = #{type,jdbcType=INTEGER}
228	228	</if>
	229	+ <if test="otherAccount != null">
	230	+ and u.other_account = #{otherAccount,jdbcType=INTEGER}
	231	+ </if>
229	232	<include refid="orderAndLimit"/>
230	233	</select>
231	234
...	...	@@ -255,6 +258,9 @@
255	258	</if>
256	259	<if test="type != null ">
257	260	and u.type = #{type,jdbcType=INTEGER}
	261	+ </if>
	262	+ <if test="otherAccount != null">
	263	+ and u.other_account = #{otherAccount,jdbcType=INTEGER}
258	264	</if>
259	265	</select>
260	266