x

src/main/java/com/yunzhi/marketing/controller/TaChannelController.java

@@ -97,9 +97,10 @@ public class TaChannelController extends BaseController {
         Integer orgId = getOrgId(request);
 
         try {
+            Institution institution = iInstitutionService.getById(institutionId);
             //使用分页插件
 		    IPage<TaChannel> pg = new Page<>(pageNum, pageSize);
-            IPage<TaChannel> result = taChannelMapper.pageTaChannel(pg,orgId,channelId,getInstitutionIds(request),institutionId);
+            IPage<TaChannel> result = taChannelMapper.pageTaChannel(pg,orgId,channelId,getInstitutionIds(request),institution.getInstitutionCode());
             List<TaChannel> recommendCount = taChannelMapper.recommendCount(orgId, channelId, getInstitutionIds(request));
 
             result.getRecords().stream().forEach(e -> {

src/main/java/com/yunzhi/marketing/mapper/TaChannelMapper.java

@@ -44,7 +44,7 @@ public interface TaChannelMapper extends BaseMapper<TaChannel> {
      * @param pg
      * @return
      */
-    IPage<TaChannel> pageTaChannel(IPage<TaChannel> pg,@Param("orgId")Integer orgId,@Param("channelId")Integer channelId,@Param("institutionIds") List<String> institutionIds,@Param("institutionId") String institutionId);
+    IPage<TaChannel> pageTaChannel(IPage<TaChannel> pg,@Param("orgId")Integer orgId,@Param("channelId")Integer channelId,@Param("institutionIds") List<String> institutionIds,@Param("institutionCode") String institutionCode);
 
     List<TaChannel> recommendCount(@Param("orgId")Integer orgId,@Param("channelId")Integer channelId,@Param("institutionIds") List<String> institutionIds);
 

src/main/resources/mapper/TaChannelMapper.xml

@@ -32,8 +32,8 @@
             and c.org_id = #{orgId}
             and c.status = 1
 
-            <if test="institutionId != null and institutionId != ''">
-                AND c.institution_id = #{institutionId}
+            <if test="institutionCode != null and institutionCode != ''">
+                AND i.institution_code like CONCAT(#{institutionCode}, '%')
             </if>
             <if test="institutionIds != null and institutionIds.size > 0">
                 AND c.institution_id in