Selaa lähdekoodia

fix 学练宝分部价格设置

shangke 7 kuukautta sitten
vanhempi
commit
657c9833ab

+ 1 - 0
mec-application/src/main/java/com/ym/mec/web/controller/MemberRankSettingController.java

@@ -105,6 +105,7 @@ public class MemberRankSettingController extends BaseController {
             queryInfo.setRows(1000);
             queryInfo.setRows(1000);
             queryInfo.setPage(1);
             queryInfo.setPage(1);
             if (CollectionUtils.isNotEmpty(organIds)) {
             if (CollectionUtils.isNotEmpty(organIds)) {
+
                 queryInfo.setOrganId(StringUtils.join(organIds, ","));
                 queryInfo.setOrganId(StringUtils.join(organIds, ","));
             }
             }
             List<MemberRankOrganizationFeeMapper> rows = memberRankOrganizationFeeMapperService.queryPage(queryInfo).getRows();
             List<MemberRankOrganizationFeeMapper> rows = memberRankOrganizationFeeMapperService.queryPage(queryInfo).getRows();

+ 3 - 1
mec-biz/src/main/resources/config/mybatis/MemberRankOrganizationFeeMapperMapper.xml

@@ -89,7 +89,9 @@
 		LEFT JOIN organization o ON o.id_ = mrofm.organ_id_
 		LEFT JOIN organization o ON o.id_ = mrofm.organ_id_
 		LEFT JOIN sys_user su ON su.id_ = mrofm.operator_id_
 		LEFT JOIN sys_user su ON su.id_ = mrofm.operator_id_
 		<where>
 		<where>
-			mrofm.tenant_id_ = #{tenantId}
+			<if test="tenantId != null">
+				AND mrofm.tenant_id_ = #{tenantId}
+			</if>
 			<if test="search != null and search != ''">
 			<if test="search != null and search != ''">
 				AND mrs.name_ LIKE CONCAT('%',#{search},'%')
 				AND mrs.name_ LIKE CONCAT('%',#{search},'%')
 			</if>
 			</if>