傅行帆 3 years ago
parent
commit
c85d9bbfb8

+ 2
- 1
src/main/java/com/yunzhi/marketing/base/BaseController.java View File

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

+ 1
- 1
src/main/java/com/yunzhi/marketing/controller/ExtendContentController.java View File

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

+ 1
- 1
src/main/java/com/yunzhi/marketing/xlk/controller/VideoController.java View File

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