zhba/zhba_management_ys.git

			@@ -103,9 +103,104 @@
			</select>

			<!--懒加载获取部门树形结构(包含用户数据)-->
			<!-- <select id="lazyTreeUser" resultMap="treeNodeResultMap">-->
			<!-- select DISTINCT * from (-->
			<!-- (SELECT-->
			<!-- dept.id,-->
			<!-- dept.parent_id,-->
			<!-- dept.dept_name AS title,-->
			<!-- dept.id AS "value",-->
			<!-- dept.id AS "key",-->
			<!-- (-->
			<!-- SELECT-->
			<!-- CASE WHEN count(1) > 0 THEN 1 ELSE 0 END-->
			<!-- FROM-->
			<!-- blade_dept-->
			<!-- WHERE-->
			<!-- parent_id = dept.id and is_deleted = 0-->
			<!-- ) AS "has_children"-->
			<!-- FROM-->
			<!-- blade_dept dept-->
			<!-- WHERE-->
			<!-- dept.is_deleted = 0-->
			<!-- )-->

			<!-- union-->

			<!-- (select-->
			<!-- id,-->
			<!-- dept_id parent_id,-->
			<!-- real_name AS title,-->
			<!-- id AS "value",-->
			<!-- id AS "key",-->
			<!-- 0 as "has_children"-->
			<!-- from blade_user-->
			<!-- )-->
			<!-- )c-->
			<!-- </select> -->

			<!--懒加载获取部门树形结构(包含用户数据)-->
			<!-- <select id="lazyTreeUser" resultMap="treeNodeResultMap">-->
			<!-- select DISTINCT * from (-->
			<!-- (SELECT-->
			<!-- dept.id,-->
			<!-- dept.parent_id,-->
			<!-- dept.dept_name AS title,-->
			<!-- dept.id AS "value",-->
			<!-- dept.id AS "key",-->
			<!-- (-->
			<!-- SELECT-->
			<!-- CASE WHEN count(1) > 0 THEN 1 ELSE 0 END-->
			<!-- FROM-->
			<!-- blade_dept-->
			<!-- WHERE-->
			<!-- parent_id = dept.id and is_deleted = 0-->
			<!-- ) AS "has_children"-->
			<!-- FROM-->
			<!-- blade_dept dept-->
			<!-- left join-->
			<!-- sys_information si-->
			<!-- on-->
			<!-- si.departmentid = dept.id-->
			<!-- WHERE-->
			<!-- dept.is_deleted = 0-->
			<!-- and si.stats = 2-->
			<!-- and si.departmentid !=1432626178757275649-->
			<!-- and si.departmentid !=1445980335107002370-->
			<!-- and si.departmentid !=1442115701350387714-->
			<!-- )-->
			<!-- union-->
			<!-- (select-->
			<!-- bu.id,-->
			<!-- bu.dept_id parent_id,-->
			<!-- real_name AS title,-->
			<!-- bu.id AS "value",-->
			<!-- bu.id AS "key",-->
			<!-- 0 as "has_children"-->
			<!-- from blade_user bu-->
			<!-- left join-->
			<!-- blade_dept bd-->
			<!-- on-->
			<!-- bd.id = bu.dept_id-->
			<!-- left join-->
			<!-- sys_information si-->
			<!-- on-->
			<!-- si.departmentid = bd.id-->
			<!-- where bd.is_deleted = 0-->
			<!-- and bu.is_deleted = 0-->
			<!-- and bu.`status` =1-->
			<!-- and si.stats = 2-->
			<!-- and si.departmentid !=1432626178757275649-->
			<!-- and si.departmentid !=1445980335107002370-->
			<!-- and si.departmentid !=1442115701350387714-->
			<!-- )-->
			<!-- )c-->
			<!-- </select> -->

			<!--懒加载获取部门树形结构(包含用户数据)-->
			<select id="lazyTreeUser" resultMap="treeNodeResultMap">
			select DISTINCT * from (
			(SELECT
			(SELECT
			dept.id,
			dept.parent_id,
			dept.dept_name AS title,
			@@ -121,28 +216,109 @@
			) AS "has_children"
			FROM
			blade_dept dept
			left join
			sys_information si
			on
			si.departmentid = dept.id
			WHERE
			dept.is_deleted = 0
			and si.stats = 2
			and si.departmentid !=1432626178757275649
			and si.departmentid !=1445980335107002370
			and si.departmentid !=1442115701350387714
			)

			union

			(select
			id,
			dept_id parent_id,
			bu.id,
			bu.dept_id parent_id,
			real_name AS title,
			id AS "value",
			id AS "key",
			bu.id AS "value",
			bu.id AS "key",
			0 as "has_children"
			from blade_user
			from blade_user bu
			left join
			blade_dept bd
			on
			bd.id = bu.dept_id
			left join
			sys_information si
			on
			si.departmentid = bd.id
			where bd.is_deleted = 0
			and bu.is_deleted = 0
			and bu.`status` =1
			and si.stats = 2
			and si.departmentid !=1432626178757275649
			and si.departmentid !=1445980335107002370
			and si.departmentid !=1442115701350387714
			)
			)c
			</select>

			<!--111-->

			<!--懒加载获取部门树形结构(包含用户数据)-->
			<!-- <select id="lazyTreeUser" resultMap="treeNodeResultMap">-->
			<!-- select DISTINCT * from (-->
			<!-- (SELECT-->
			<!-- dept.id,-->
			<!-- dept.parent_id,-->
			<!-- dept.dept_name AS title,-->
			<!-- dept.id AS "value",-->
			<!-- dept.id AS "key",-->
			<!-- (-->
			<!-- SELECT-->
			<!-- CASE WHEN count(1) > 0 THEN 1 ELSE 0 END-->
			<!-- FROM-->
			<!-- blade_dept-->
			<!-- WHERE-->
			<!-- parent_id = dept.id and is_deleted = 0-->
			<!-- ) AS "has_children"-->
			<!-- FROM-->
			<!-- blade_dept dept-->
			<!-- left join-->
			<!-- sys_information si-->
			<!-- on-->
			<!-- si.departmentid = dept.id-->
			<!-- WHERE-->
			<!-- dept.is_deleted = 0-->
			<!-- and si.stats = 2-->
			<!-- and (si.departmentid = 1442114073838800898-->
			<!-- or si.departmentid = 1442115701350387714)-->
			<!-- )-->

			<!-- union-->

			<!-- (select-->
			<!-- bu.id,-->
			<!-- bu.dept_id parent_id,-->
			<!-- real_name AS title,-->
			<!-- bu.id AS "value",-->
			<!-- bu.id AS "key",-->
			<!-- 0 as "has_children"-->
			<!-- from blade_user bu-->
			<!-- left join-->
			<!-- blade_dept bd-->
			<!-- on-->
			<!-- bd.id = bu.dept_id-->
			<!-- left join-->
			<!-- sys_information si-->
			<!-- on-->
			<!-- si.departmentid = bd.id-->
			<!-- where bd.is_deleted = 0-->
			<!-- and bu.is_deleted = 0-->
			<!-- and bu.`status` =1-->
			<!-- and si.stats = 2-->
			<!-- and (si.departmentid = 1442114073838800898-->
			<!-- or si.departmentid = 1442115701350387714)-->
			<!-- )-->
			<!-- )c-->
			<!-- </select>-->

			<!--懒加载获取部门树形结构(包含用户数据)-->
			<select id="lazyTreeUsers" resultType="org.springblade.modules.system.node.TreeNodes" >
			select DISTINCT
			*
			*
			from (
			(SELECT
			dept.id,
			@@ -397,7 +573,7 @@
			AND role_id = '1412226235153731586'
			and status = 1
			GROUP BY dept_id) C ON A.departmentid = C.dept_id
			WHERE A.jurisdiction in (${deptid})
			WHERE A.jurisdiction in(${deptid})
			GROUP BY cz, wcz
			</select>