diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan index 3a283a9..4922057 160000 --- a/epdc-cloud-commons-yushan +++ b/epdc-cloud-commons-yushan @@ -1 +1 @@ -Subproject commit 3a283a9161b64d8c907b45097bddc3d4059e12c9 +Subproject commit 4922057d5b573d51f8a9eabfdd9a754c5d857d5b diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/controller/HouseSaleRentController.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/controller/HouseSaleRentController.java index a5225a1..56fc8a8 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/controller/HouseSaleRentController.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/controller/HouseSaleRentController.java @@ -1,11 +1,9 @@ package com.elink.esua.epdc.vaccine.house.controller; -import com.elink.esua.epdc.commons.tools.annotation.LoginUser; import com.elink.esua.epdc.commons.tools.enums.HouseSaleRentAuditStatusEnum; import com.elink.esua.epdc.commons.tools.enums.HouseSaleRentStatusEnum; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.house.form.HouseSaleRentInfoPublishFormDTO; import com.elink.esua.epdc.dto.house.result.HouseSaleRentInfoDetailResultDTO; @@ -34,7 +32,7 @@ public class HouseSaleRentController { * @date: 2023/5/5 3:06 PM */ @PostMapping("publish") - public Result publish(@RequestBody HouseSaleRentInfoPublishFormDTO form, @LoginUser UserDetail user) { + public Result publish(@RequestBody HouseSaleRentInfoPublishFormDTO form) { houseSaleRentServiceService.publish(form); return new Result(); } @@ -62,16 +60,15 @@ public class HouseSaleRentController { /** * @description: 居民端-我发布的列表 - * @param userDetail: * @return * @author: WangXianZhang * @date: 2023/5/5 5:31 PM */ @GetMapping("resi/mypublishedlist") - public Result> listMyPuhlishedList(@LoginUser UserDetail userDetail, + public Result> listMyPuhlishedList(@RequestParam("userId") String userId, @RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize) { - PageData pd = houseSaleRentServiceService.listMyPuhlishedList(userDetail.getId(), pageNum, pageSize); + PageData pd = houseSaleRentServiceService.listMyPuhlishedList(userId, pageNum, pageSize); return new Result>().ok(pd); } diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/service/HouseSaleRentServiceService.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/service/HouseSaleRentServiceService.java index 97510c4..d53e1d7 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/service/HouseSaleRentServiceService.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/service/HouseSaleRentServiceService.java @@ -14,7 +14,7 @@ public interface HouseSaleRentServiceService { void audit(String id, Integer auditStatus); - PageData listMyPuhlishedList(Long userId, Integer pageNum, Integer pageSize); + PageData listMyPuhlishedList(String userId, Integer pageNum, Integer pageSize); HouseSaleRentInfoDetailResultDTO houseDetail(String id); diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/service/impl/HouseSaleRentServiceServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/service/impl/HouseSaleRentServiceServiceImpl.java index f074a6c..3fb7d2d 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/service/impl/HouseSaleRentServiceServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/service/impl/HouseSaleRentServiceServiceImpl.java @@ -119,7 +119,7 @@ public class HouseSaleRentServiceServiceImpl implements HouseSaleRentServiceServ } @Override - public PageData listMyPuhlishedList(Long userId, Integer pageNum, Integer pageSize) { + public PageData listMyPuhlishedList(String userId, Integer pageNum, Integer pageSize) { LambdaQueryWrapper q = new LambdaQueryWrapper<>(); q.eq(HouseSaleRentInfoEntity::getCreatedBy, userId);