Browse Source

区分机构信息

zouxuan 2 years ago
parent
commit
8dce763726

+ 4 - 1
mec-biz/src/main/resources/config/mybatis/DegreeLevelFeeNewMapper.xml

@@ -6,8 +6,11 @@
 		select dlf.*,s.name_ subjectName from degree_level_fee dlf
 		select dlf.*,s.name_ subjectName from degree_level_fee dlf
 		left join subject s ON dlf.subject_id_ = s.id_
 		left join subject s ON dlf.subject_id_ = s.id_
 		<where>
 		<where>
+			<if test="param.tenantId != null">
+				AND dlf.tenant_id_ = #{param.tenantId}
+			</if>
 			<if test="param.subjectId != null">
 			<if test="param.subjectId != null">
-				dlf.subject_id_ = #{param.subjectId}
+				AND dlf.subject_id_ = #{param.subjectId}
 			</if>
 			</if>
 			<if test="param.level != null">
 			<if test="param.level != null">
 				AND dlf.level_ = #{param.level}
 				AND dlf.level_ = #{param.level}

+ 3 - 0
mec-biz/src/main/resources/config/mybatis/DegreeNewsMapper.xml

@@ -6,6 +6,9 @@
 		select dn.*,GROUP_CONCAT(distinct o.name_) organNames from degree_news dn
 		select dn.*,GROUP_CONCAT(distinct o.name_) organNames from degree_news dn
 		left join organization o ON FIND_IN_SET(o.id_,dn.organ_ids_)
 		left join organization o ON FIND_IN_SET(o.id_,dn.organ_ids_)
 		<where>
 		<where>
+			<if test="param.tenantId != null">
+				AND dn.tenant_id_ = #{param.tenantId}
+			</if>
 			<if test="param.keyword != null and param.keyword != ''">
 			<if test="param.keyword != null and param.keyword != ''">
 				AND dn.title_ LIKE CONCAT('%',#{param.keyword},'%')
 				AND dn.title_ LIKE CONCAT('%',#{param.keyword},'%')
 			</if>
 			</if>