fuxingfan 3 年之前
父節點
當前提交
33db1179e6

+ 2
- 1
src/main/java/com/yunzhi/marketing/controller/TaChannelController.java 查看文件

97
         Integer orgId = getOrgId(request);
97
         Integer orgId = getOrgId(request);
98
 
98
 
99
         try {
99
         try {
100
+            Institution institution = iInstitutionService.getById(institutionId);
100
             //使用分页插件
101
             //使用分页插件
101
 		    IPage<TaChannel> pg = new Page<>(pageNum, pageSize);
102
 		    IPage<TaChannel> pg = new Page<>(pageNum, pageSize);
102
-            IPage<TaChannel> result = taChannelMapper.pageTaChannel(pg,orgId,channelId,getInstitutionIds(request),institutionId);
103
+            IPage<TaChannel> result = taChannelMapper.pageTaChannel(pg,orgId,channelId,getInstitutionIds(request),institution.getInstitutionCode());
103
             List<TaChannel> recommendCount = taChannelMapper.recommendCount(orgId, channelId, getInstitutionIds(request));
104
             List<TaChannel> recommendCount = taChannelMapper.recommendCount(orgId, channelId, getInstitutionIds(request));
104
 
105
 
105
             result.getRecords().stream().forEach(e -> {
106
             result.getRecords().stream().forEach(e -> {

+ 1
- 1
src/main/java/com/yunzhi/marketing/mapper/TaChannelMapper.java 查看文件

44
      * @param pg
44
      * @param pg
45
      * @return
45
      * @return
46
      */
46
      */
47
-    IPage<TaChannel> pageTaChannel(IPage<TaChannel> pg,@Param("orgId")Integer orgId,@Param("channelId")Integer channelId,@Param("institutionIds") List<String> institutionIds,@Param("institutionId") String institutionId);
47
+    IPage<TaChannel> pageTaChannel(IPage<TaChannel> pg,@Param("orgId")Integer orgId,@Param("channelId")Integer channelId,@Param("institutionIds") List<String> institutionIds,@Param("institutionCode") String institutionCode);
48
 
48
 
49
     List<TaChannel> recommendCount(@Param("orgId")Integer orgId,@Param("channelId")Integer channelId,@Param("institutionIds") List<String> institutionIds);
49
     List<TaChannel> recommendCount(@Param("orgId")Integer orgId,@Param("channelId")Integer channelId,@Param("institutionIds") List<String> institutionIds);
50
 
50
 

+ 2
- 2
src/main/resources/mapper/TaChannelMapper.xml 查看文件

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