From 4596f9203912cfcf54e2ad078b52c103e38296e3 Mon Sep 17 00:00:00 2001 From: wans <747101512@qq.com> Date: Tue, 15 Feb 2022 17:10:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E7=A7=9F=E6=88=BF?= =?UTF-8?q?=E3=80=81=E6=88=BF=E5=B1=8B=E7=AE=A1=E7=90=86APP=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=A0=B9=E6=8D=AE=E7=99=BB=E5=BD=95=E4=BA=BA=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apis/buildinghouse/BuildingHouseAppController.java | 4 ++++ .../app/apis/citybuilding/CityBuildingAppController.java | 4 ++++ .../apis/rentalhousing/RentalHousingAppController.java | 4 ++++ .../mapper/buildinghouse/building-house-mapper.xml | 3 +++ .../mybatis/mapper/citybuilding/citybuilding-mapper.xml | 9 ++------- .../mapper/rentalhousing/rentalhousing-mapper.xml | 9 ++------- 6 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/cm/population/controller/app/apis/buildinghouse/BuildingHouseAppController.java b/src/main/java/com/cm/population/controller/app/apis/buildinghouse/BuildingHouseAppController.java index 9c06e82..7350fa9 100644 --- a/src/main/java/com/cm/population/controller/app/apis/buildinghouse/BuildingHouseAppController.java +++ b/src/main/java/com/cm/population/controller/app/apis/buildinghouse/BuildingHouseAppController.java @@ -8,6 +8,8 @@ import com.cm.common.result.ErrorResult; import com.cm.common.result.SuccessResult; import com.cm.common.result.SuccessResultData; import com.cm.common.result.SuccessResultList; +import com.cm.common.token.app.AppTokenManager; +import com.cm.common.token.app.entity.AppTokenUser; import com.cm.population.pojo.dtos.buildinghouse.BuildingHouseDTO; import com.cm.population.pojo.vos.buildinghouse.BuildingHouseVO; import com.cm.population.service.buildinghouse.IBuildingHouseService; @@ -106,6 +108,8 @@ public class BuildingHouseAppController extends AbstractController { @GetMapping("listpagebuildinghouse") public SuccessResultList> listPage(@RequestHeader("token") String token, ListPage page) { Map params = requestParams(); + AppTokenUser appTokenUser = AppTokenManager.getInstance().getToken(token).getAppTokenUser(); + params.put("creator",appTokenUser.getId()); page.setParams(params); return buildingHouseService.listPage(page); } diff --git a/src/main/java/com/cm/population/controller/app/apis/citybuilding/CityBuildingAppController.java b/src/main/java/com/cm/population/controller/app/apis/citybuilding/CityBuildingAppController.java index 9e3f160..c4d2ee0 100644 --- a/src/main/java/com/cm/population/controller/app/apis/citybuilding/CityBuildingAppController.java +++ b/src/main/java/com/cm/population/controller/app/apis/citybuilding/CityBuildingAppController.java @@ -10,6 +10,8 @@ import com.cm.common.result.ErrorResult; import com.cm.common.result.SuccessResult; import com.cm.common.result.SuccessResultData; import com.cm.common.result.SuccessResultList; +import com.cm.common.token.app.AppTokenManager; +import com.cm.common.token.app.entity.AppTokenUser; import com.cm.population.pojo.dtos.citybuilding.CityBuildingDTO; import com.cm.population.pojo.vos.citybuilding.CityBuildingVO; import com.cm.population.service.citybuilding.ICityBuildingService; @@ -104,6 +106,8 @@ public class CityBuildingAppController extends AbstractController { @GetMapping("listpagecitybuilding") public SuccessResultList> listPageCityBuilding(@RequestHeader("token") String token, ListPage page) throws SearchException { Map params = requestParams(); + AppTokenUser appTokenUser = AppTokenManager.getInstance().getToken(token).getAppTokenUser(); + params.put("creator",appTokenUser.getId()); page.setParams(params); return cityBuildingService.listPageCityBuilding(page); } diff --git a/src/main/java/com/cm/population/controller/app/apis/rentalhousing/RentalHousingAppController.java b/src/main/java/com/cm/population/controller/app/apis/rentalhousing/RentalHousingAppController.java index a761fba..d568722 100644 --- a/src/main/java/com/cm/population/controller/app/apis/rentalhousing/RentalHousingAppController.java +++ b/src/main/java/com/cm/population/controller/app/apis/rentalhousing/RentalHousingAppController.java @@ -10,6 +10,8 @@ import com.cm.common.result.ErrorResult; import com.cm.common.result.SuccessResult; import com.cm.common.result.SuccessResultData; import com.cm.common.result.SuccessResultList; +import com.cm.common.token.app.AppTokenManager; +import com.cm.common.token.app.entity.AppTokenUser; import com.cm.population.pojo.dtos.rentalhousing.RentalHousingDTO; import com.cm.population.pojo.vos.rentalhousing.RentalHousingVO; import com.cm.population.service.rentalhousing.IRentalHousingService; @@ -105,6 +107,8 @@ public class RentalHousingAppController extends AbstractController { @GetMapping("listpagerentalhousing") public SuccessResultList> listPageRentalHousing(@RequestHeader("token") String token, ListPage page) throws SearchException { Map params = requestParams(); + AppTokenUser appTokenUser = AppTokenManager.getInstance().getToken(token).getAppTokenUser(); + params.put("creator",appTokenUser.getId()); page.setParams(params); return rentalHousingService.listPageRentalHousing(page); } diff --git a/src/main/resources/mybatis/mapper/buildinghouse/building-house-mapper.xml b/src/main/resources/mybatis/mapper/buildinghouse/building-house-mapper.xml index 9879fc9..5e0ee95 100644 --- a/src/main/resources/mybatis/mapper/buildinghouse/building-house-mapper.xml +++ b/src/main/resources/mybatis/mapper/buildinghouse/building-house-mapper.xml @@ -259,6 +259,9 @@ AND LEFT(t1.gmt_create, 10) #{endTime} + + AND FIND_IN_SET(t1.creator, #{creator}) + AND t1.building_house_id IN diff --git a/src/main/resources/mybatis/mapper/citybuilding/citybuilding-mapper.xml b/src/main/resources/mybatis/mapper/citybuilding/citybuilding-mapper.xml index ac4a403..8c8d746 100644 --- a/src/main/resources/mybatis/mapper/citybuilding/citybuilding-mapper.xml +++ b/src/main/resources/mybatis/mapper/citybuilding/citybuilding-mapper.xml @@ -172,13 +172,8 @@ t1.district_name LIKE CONCAT('%', #{keywords}, '%') ) - - AND - LEFT(t1.gmt_create, 10) = ]]> #{startTime} - - - AND - LEFT(t1.gmt_create, 10) #{endTime} + + AND FIND_IN_SET(t1.creator, #{creator}) AND diff --git a/src/main/resources/mybatis/mapper/rentalhousing/rentalhousing-mapper.xml b/src/main/resources/mybatis/mapper/rentalhousing/rentalhousing-mapper.xml index 76db9d4..ded3bf4 100644 --- a/src/main/resources/mybatis/mapper/rentalhousing/rentalhousing-mapper.xml +++ b/src/main/resources/mybatis/mapper/rentalhousing/rentalhousing-mapper.xml @@ -301,13 +301,8 @@ t1.card_number LIKE CONCAT('%', #{keywords}, '%') ) - - AND - LEFT(t1.gmt_create, 10) = ]]> #{startTime} - - - AND - LEFT(t1.gmt_create, 10) #{endTime} + + AND FIND_IN_SET(t1.creator, #{creator}) AND