From 7ef49f946f97a0dd6597c2bb96936ebe512ffdd7 Mon Sep 17 00:00:00 2001 From: bianyadong Date: Wed, 22 May 2024 19:34:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E8=BE=96=E5=A4=A7=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/impl/TempUserDetailServiceImpl.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java index a85a1846f..481f93096 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java @@ -2,10 +2,7 @@ package com.cool.store.service.impl; import com.cool.store.dao.*; import com.cool.store.dto.ehr.StaffBaseInfoDTO; -import com.cool.store.entity.EnterpriseUserDO; -import com.cool.store.entity.ShopInfoDO; -import com.cool.store.entity.ShopStageInfoDO; -import com.cool.store.entity.TempUserDetailDO; +import com.cool.store.entity.*; import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.enums.MessageEnum; import com.cool.store.enums.UserRoleEnum; @@ -59,6 +56,9 @@ public class TempUserDetailServiceImpl implements TempUserDetailService { @Autowired private PreparationService preparationService; + @Autowired + private RegionDao regionDao; + @Override public TempUserDetailListVO userList(Long shopId) { List tempUserDetailDOList = tempUserDetailDAO.userList(shopId); @@ -138,8 +138,9 @@ public class TempUserDetailServiceImpl implements TempUserDetailService { } List userIdList = enterpriseUserRoleDao.getUserIdsByRoleIdList(Collections.singletonList(UserRoleEnum.TRAINER.getCode())); + RegionDO regionDO = regionDao.getRegionById(shopInfoDO.getRegionId()); // - userIdList = enterpriseUserDAO.getUserIdListByRegionId(shopInfoDO.getRegionId(), userIdList); + userIdList = enterpriseUserDAO.getUserIdListByRegionId(Long.valueOf(regionDO.getParentId()), userIdList); Map messageMap = new HashMap<>(); messageMap.put("userName", tempUserDetailRequest.getName());