diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java index 144b38aace..26ad711e95 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java @@ -61,25 +61,27 @@ public class PaCustomerController { /** * @param formDTO + * @param source 服务端类型 dev:开发 test:体验 prod:生产 * @return * @Author sun * @Description 公众号-创建组织 **/ @PostMapping("createagency") - public Result createAgency(@LoginUser TokenDto tokenDTO, @RequestBody CreateAgencyFormDTO formDTO) { + public Result createAgency(@LoginUser TokenDto tokenDTO, @RequestBody CreateAgencyFormDTO formDTO,@RequestHeader("source")String source) { ValidatorUtils.validateEntity(formDTO, DefaultGroup.class); - return new Result().ok(paCustomerService.createAgency(tokenDTO, formDTO)); + return new Result().ok(paCustomerService.createAgency(tokenDTO, formDTO,source)); } /** * @param tokenDTO + * @param source 服务端类型 dev:开发 test:体验 prod:生产 * @return * @Author sun * @Description 公众号-查询我的信息 **/ @PostMapping("myinfo") - public Result myInfo(@LoginUser TokenDto tokenDTO) { - return new Result().ok(paCustomerService.myInfo(tokenDTO)); + public Result myInfo(@LoginUser TokenDto tokenDTO,@RequestHeader("source")String source) { + return new Result().ok(paCustomerService.myInfo(tokenDTO,source)); } /** diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerUserAgencyDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerUserAgencyDao.java index 123300af1a..cb819bdee8 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerUserAgencyDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerUserAgencyDao.java @@ -38,5 +38,5 @@ public interface PaCustomerUserAgencyDao extends BaseDao { /** * @param formDTO + * @param source 服务端类型 dev:开发 test:体验 prod:生产 * @return * @Author sun * @Description 公众号-创建组织 **/ - CreateAgencyResultDTO createAgency(TokenDto tokenDTO, CreateAgencyFormDTO formDTO); + CreateAgencyResultDTO createAgency(TokenDto tokenDTO, CreateAgencyFormDTO formDTO,String source); /** * @param tokenDTO + * @param source 服务端类型 dev:开发 test:体验 prod:生产 * @return * @Author sun * @Description 公众号-查询我的信息 **/ - MyInfoResultDTO myInfo(TokenDto tokenDTO); + MyInfoResultDTO myInfo(TokenDto tokenDTO,String source); /** * @param formDTO diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java index fb4c90293b..3c2205f2c4 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java @@ -289,17 +289,19 @@ public class PaCustomerServiceImpl extends BaseServiceImpl SELECT - id, - customer_id, - agency_id, - user_id + pcua.id, + pcua.customer_id, + pcua.agency_id, + pcua.user_id FROM - pa_customer_user_agency + pa_customer_user_agency pcua + LEFT JOIN pa_user pu ON pu.id = pcua.user_id WHERE - del_flag = '0' - AND user_id = #{userId} + pcua.del_flag = '0' + AND pu.del_flag = '0' + AND pcua.user_id = #{userId} + AND pu.source = #{source} \ No newline at end of file