|
@@ -9,7 +9,6 @@ import com.gree.mall.miniapp.bean.worker.TeamCount;
|
|
|
import com.gree.mall.miniapp.bean.worker.WebsitWorkerBean;
|
|
|
import com.gree.mall.miniapp.bean.worker.WorkerTeamApplyBean;
|
|
|
import com.gree.mall.miniapp.bean.worker.WorkerTeamBean;
|
|
|
-import com.gree.mall.miniapp.commonmapper.CommonMapper;
|
|
|
import com.gree.mall.miniapp.enums.ExamineStatusEnum;
|
|
|
import com.gree.mall.miniapp.enums.StateEnum;
|
|
|
import com.gree.mall.miniapp.exception.RemoteServiceException;
|
|
@@ -38,8 +37,6 @@ public class WorkerTeamLogic {
|
|
|
@Resource
|
|
|
CommonLogic commonLogic;
|
|
|
@Resource
|
|
|
- CommonMapper commonMapper;
|
|
|
- @Resource
|
|
|
UserService userService;
|
|
|
@Resource
|
|
|
WebsitUserService websitUserService;
|
|
@@ -60,7 +57,6 @@ public class WorkerTeamLogic {
|
|
|
BeanUtil.copyProperties(page, newPage, "records");
|
|
|
newPage.setRecords(new ArrayList<>());
|
|
|
|
|
|
- Map<String, String> websitMap = new HashMap<>();
|
|
|
if (CollectionUtil.isNotEmpty(page.getRecords())) {
|
|
|
List<AdminWebsit> adminWebsitList = adminWebsitUserService.lambdaQuery()
|
|
|
.eq(AdminWebsit::getCompanyWechatId, current.getUser().getCompanyWechatId())
|
|
@@ -68,7 +64,7 @@ public class WorkerTeamLogic {
|
|
|
.map(WorkerTeamApply::getWebsitId)
|
|
|
.collect(Collectors.toList()))
|
|
|
.list();
|
|
|
- websitMap = adminWebsitList.stream().collect(Collectors.toMap(AdminWebsit::getWebsitId, AdminWebsit::getName));
|
|
|
+ Map<String, String> websitMap = adminWebsitList.stream().collect(Collectors.toMap(AdminWebsit::getWebsitId, AdminWebsit::getName));
|
|
|
final List<WorkerTeamApplyBean> beanList = BeanUtil.copyToList(page.getRecords(), WorkerTeamApplyBean.class);
|
|
|
for (WorkerTeamApplyBean applyBean : beanList) {
|
|
|
final String name = websitMap.get(applyBean.getWebsitId());
|
|
@@ -94,7 +90,6 @@ public class WorkerTeamLogic {
|
|
|
BeanUtil.copyProperties(page, newPage, "records");
|
|
|
newPage.setRecords(new ArrayList<>());
|
|
|
|
|
|
- Map<String, String> websitMap = new HashMap<>();
|
|
|
if (CollectionUtil.isNotEmpty(page.getRecords())) {
|
|
|
List<AdminWebsit> adminWebsitList = adminWebsitUserService.lambdaQuery()
|
|
|
.eq(AdminWebsit::getCompanyWechatId, current.getUser().getCompanyWechatId())
|
|
@@ -102,7 +97,7 @@ public class WorkerTeamLogic {
|
|
|
.map(WorkerTeam::getWebsitId)
|
|
|
.collect(Collectors.toList()))
|
|
|
.list();
|
|
|
- websitMap = adminWebsitList.stream().collect(Collectors.toMap(AdminWebsit::getWebsitId, AdminWebsit::getName));
|
|
|
+ Map<String, String> websitMap = adminWebsitList.stream().collect(Collectors.toMap(AdminWebsit::getWebsitId, AdminWebsit::getName));
|
|
|
final List<WorkerTeamBean> beanList = BeanUtil.copyToList(page.getRecords(), WorkerTeamBean.class);
|
|
|
for (WorkerTeamBean applyBean : beanList) {
|
|
|
final String name = websitMap.get(applyBean.getWebsitId());
|