|
@@ -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");
|