Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reimbursementApproval/approvalType/mapper/xml/CwReimbursementTypeMapper.xml

@@ -143,11 +143,37 @@
 			t.NAME,
 			t.sort,
 			t.parent_id,
-			t.parent_ids,
-			t.office_id_list,
-			t.office_d_t_o_list
+			t.parent_ids
 			FROM
-				(SELECT
+				(
+				SELECT
+					id,
+					create_date,
+					a.create_by,
+					a.update_date,
+					a.update_by,
+					a.del_flag,
+					a.LEVEL,
+					a.NAME,
+					a.sort,
+					a.parent_id,
+					a.parent_ids
+				FROM
+					cw_reimbursement_type_info a
+				WHERE
+					del_flag = 0
+					AND a.id IN (
+					SELECT
+						id
+					FROM
+						cw_reimbursement_type_info a
+					WHERE
+						del_flag = 0
+					AND a.parent_id NOT IN ( SELECT b.reimbursement_type_id FROM cw_reimbursement_type_office_info b)
+					AND a.id NOT IN ( SELECT b.reimbursement_type_id FROM cw_reimbursement_type_office_info b)
+					)
+					union
+				SELECT
 					id,
 					create_date,
 					a.create_by,
@@ -158,9 +184,7 @@
 					a.NAME,
 					a.sort,
 					a.parent_id,
-					a.parent_ids,
-					a.office_id_list,
-					a.office_d_t_o_list
+					a.parent_ids
 					FROM
 					cw_reimbursement_type_info a
 					WHERE
@@ -178,9 +202,7 @@
 					a.NAME,
 					a.sort,
 					a.parent_id,
-					a.parent_ids,
-					a.office_id_list,
-					a.office_d_t_o_list
+					a.parent_ids
 					FROM
 					cw_reimbursement_type_info a
 					WHERE
@@ -196,25 +218,23 @@
 						)
 				UNION
 				SELECT
-			id,
-			create_date,
-			a.create_by,
-			a.update_date,
-			a.update_by,
-			a.del_flag,
-			a.LEVEL,
-			a.NAME,
-			a.sort,
-			a.parent_id,
-			a.parent_ids,
-			a.office_id_list,
-			a.office_d_t_o_list
-			FROM
-			cw_reimbursement_type_info a
-			WHERE
-			del_flag = 0
-			and a.id in (SELECT b.reimbursement_type_id FROM cw_reimbursement_type_office_info b WHERE b.office_id = #{officeId})
-						) t
+					id,
+					create_date,
+					a.create_by,
+					a.update_date,
+					a.update_by,
+					a.del_flag,
+					a.LEVEL,
+					a.NAME,
+					a.sort,
+					a.parent_id,
+					a.parent_ids
+					FROM
+					cw_reimbursement_type_info a
+					WHERE
+					del_flag = 0
+					and a.id in (SELECT b.reimbursement_type_id FROM cw_reimbursement_type_office_info b WHERE b.office_id = #{officeId})
+				) t
 			${ew.customSqlSegment}
 	</select>