java/YiFeiNN.git

			@@ -146,7 +146,9 @@
			su.USER_NAME,
			su.STATUS,
			sd.DEPARTMENT_NAME,
			sr.ROLE_NAME
			sr.ROLE_NAME,
			su.DEPARTMENT_ID,
			su.RELATION
			FROM SYS_USER su
			LEFT JOIN SYS_DEPARTMENT sd
			ON su.DEPARTMENT_ID = sd.ID
			@@ -155,17 +157,15 @@
			LEFT JOIN SYS_ROLE sr
			ON sr.ROLE_ID = sur.ROLE_ID
			<where>
			<if test="departmentId != null and departmentId != ''">]
			sud.DEPARTMENT_ID = #{departmentId}
			su.DEL_FLAG = 0
			<if test="nickName != null and nickName != ''">
			AND su.NICK_NAME LIKE CONCAT('%',#{nickName},'%')
			</if>
			<if test="nickName != null and nickName != ''">]
			su.NICK_NAME LIKE CONCAT('%',#{nickName},'%')
			</if>
			<if test="roleId != null and roleId != ''">]
			sur.ROLE_ID = #{roleId}
			<if test="roleId != null and roleId != ''">
			AND sur.ROLE_ID = #{roleId}
			</if>
			<if test="treeCode != null and treeCode != ''">
			sd.TREE_CODE LIKE CONCAT(#{treeCode},'%')
			AND sd.TREE_CODE LIKE CONCAT(#{treeCode},'%')
			</if>
			</where>
			</select>