傅行帆 3 년 전
부모
커밋
6fab076854

+ 1
- 1
src/main/java/com/yunzhi/marketing/service/impl/TaNewsServiceImpl.java 파일 보기

70
         taNewsQueryWrapper.eq("status", 1);
70
         taNewsQueryWrapper.eq("status", 1);
71
         taNewsQueryWrapper.eq(cityId != null, "city_id", cityId);
71
         taNewsQueryWrapper.eq(cityId != null, "city_id", cityId);
72
         taNewsQueryWrapper.like(title!=null,"news_name", title);
72
         taNewsQueryWrapper.like(title!=null,"news_name", title);
73
-        taNewsQueryWrapper.in("institution_id",institutionIds);
73
+//        taNewsQueryWrapper.in("institution_id",institutionIds);
74
         taNewsQueryWrapper.in(personBuildingList.size() > 0,"building_id",personBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList()));
74
         taNewsQueryWrapper.in(personBuildingList.size() > 0,"building_id",personBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList()));
75
         taNewsQueryWrapper.orderByAsc("news_status");
75
         taNewsQueryWrapper.orderByAsc("news_status");
76
         taNewsQueryWrapper.orderByDesc("weight","create_date");
76
         taNewsQueryWrapper.orderByDesc("weight","create_date");

+ 1
- 1
src/main/java/com/yunzhi/marketing/service/impl/TaNewsTypeServiceImpl.java 파일 보기

52
         taNewsQueryWrapper.eq(StringUtils.isNotBlank(buildingId),"building_id", buildingId);
52
         taNewsQueryWrapper.eq(StringUtils.isNotBlank(buildingId),"building_id", buildingId);
53
         taNewsQueryWrapper.eq(orgId != null,"org_id", orgId);
53
         taNewsQueryWrapper.eq(orgId != null,"org_id", orgId);
54
         taNewsQueryWrapper.eq("status", 1);
54
         taNewsQueryWrapper.eq("status", 1);
55
-        taNewsQueryWrapper.in("institution_id",institutionIds);
55
+//        taNewsQueryWrapper.in("institution_id",institutionIds);
56
         taNewsQueryWrapper.in(personBuildingList.size() > 0,"building_id", personBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList()));
56
         taNewsQueryWrapper.in(personBuildingList.size() > 0,"building_id", personBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList()));
57
         taNewsQueryWrapper.orderByDesc("create_date");
57
         taNewsQueryWrapper.orderByDesc("create_date");
58
         IPage<TaNewsType> typeIPage = this.page(page, taNewsQueryWrapper);
58
         IPage<TaNewsType> typeIPage = this.page(page, taNewsQueryWrapper);