1

src/main/java/com/yunzhi/marketing/base/BaseController.java

@@ -128,8 +128,7 @@ public class BaseController {
     public List<String> getInstitutionIds(HttpServletRequest request) {
         TaUser taUser = taUserService.getById(getUserId(request));
         List<Institution> list = iInstitutionService.getAllByUser(taUser);
-//        return list.stream().map(Institution::getInstitutionId).collect(Collectors.toList());
-        return null;
+        return list.stream().map(Institution::getInstitutionId).collect(Collectors.toList());
     }
 
     /**

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

@@ -97,7 +97,7 @@ public class ExtendContentController extends BaseController {
             queryWrapper.ne("status",9);
             queryWrapper.eq(status != null, "status", status);
             queryWrapper.eq( "org_id", getOrgId(request));
-//            queryWrapper.in("institution_id",getInstitutionIds(request));
+            queryWrapper.in("institution_id",getInstitutionIds(request));
             queryWrapper.and(taPersonBuildingList.size() > 0, wapper -> wapper.in("building_id",taPersonBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList())).or().eq("create_user",getUserId(request)));
             queryWrapper.orderByDesc("order_no");
             queryWrapper.orderByDesc("create_date");

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

@@ -85,7 +85,7 @@ public class TaPolicyController extends BaseController {
             queryWrapper.orderByDesc("weight", "create_date");
             queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
             queryWrapper.eq("org_id", getOrgId(request));
-//            queryWrapper.in("institution_id",getInstitutionIds(request));
+            queryWrapper.in("institution_id",getInstitutionIds(request));
 
             IPage<TaPolicy> result = iTaPolicyService.page(pg, queryWrapper);
             List<TaPolicy> records = result.getRecords();

src/main/java/com/yunzhi/marketing/service/impl/TaBuildingServiceImpl.java

@@ -720,7 +720,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     /**
-     * 生成六位推荐码 重复重新生成
+     * 生成六位 重复重新生成
      * @return
      */
     private void getMyMarktingCode() {

src/main/java/com/yunzhi/marketing/service/impl/TaNewsServiceImpl.java

@@ -70,7 +70,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
         taNewsQueryWrapper.eq("status", 1);
         taNewsQueryWrapper.eq(cityId != null, "city_id", cityId);
         taNewsQueryWrapper.like(title!=null,"news_name", title);
-//        taNewsQueryWrapper.in("institution_id",institutionIds);
+        taNewsQueryWrapper.in("institution_id",institutionIds);
         taNewsQueryWrapper.in(personBuildingList.size() > 0,"building_id",personBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList()));
         taNewsQueryWrapper.orderByAsc("news_status");
         taNewsQueryWrapper.orderByDesc("weight","create_date");

src/main/java/com/yunzhi/marketing/service/impl/TaNewsTypeServiceImpl.java

@@ -52,7 +52,7 @@ public class TaNewsTypeServiceImpl extends ServiceImpl<TaNewsTypeMapper, TaNewsT
         taNewsQueryWrapper.eq(StringUtils.isNotBlank(buildingId),"building_id", buildingId);
         taNewsQueryWrapper.eq(orgId != null,"org_id", orgId);
         taNewsQueryWrapper.eq("status", 1);
-//        taNewsQueryWrapper.in("institution_id",institutionIds);
+        taNewsQueryWrapper.in("institution_id",institutionIds);
         taNewsQueryWrapper.in(personBuildingList.size() > 0,"building_id", personBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList()));
         taNewsQueryWrapper.orderByDesc("create_date");
         IPage<TaNewsType> typeIPage = this.page(page, taNewsQueryWrapper);

src/main/java/com/yunzhi/marketing/xlk/controller/CurriculumController.java

@@ -86,7 +86,7 @@ public class CurriculumController extends BaseController {
             queryWrapper.eq(Curriculum::getOrgId,getOrgId(request));
             queryWrapper.like(!StringUtils.isEmpty(name),Curriculum::getName,'%'+name+'%');
             queryWrapper.eq(null != roleId,Curriculum::getRoleId,roleId);
-//            queryWrapper.in(Curriculum::getInstitutionId,getInstitutionIds(request));
+            queryWrapper.in(Curriculum::getInstitutionId,getInstitutionIds(request));
             queryWrapper.orderByDesc(Curriculum::getWeight);
             queryWrapper.orderByDesc(Curriculum::getCreatedTime);
 

src/main/java/com/yunzhi/marketing/xlk/controller/VideoController.java

@@ -77,7 +77,7 @@ public class VideoController extends BaseController {
             LambdaQueryWrapper<Video> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(!StringUtils.isEmpty(name),Video::getName,name);
             queryWrapper.eq(Video::getOrgId,getOrgId(request));
-//            queryWrapper.in(Video::getInstitutionId,getInstitutionIds(request));
+            queryWrapper.in(Video::getInstitutionId,getInstitutionIds(request));
             queryWrapper.orderByDesc(Video::getWeight);
             queryWrapper.orderByDesc(Video::getCreatedTime);