x

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

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