|
@@ -711,6 +711,7 @@ public class WebsitSalesLogic {
|
|
|
List<User> userList = userService.lambdaQuery()
|
|
|
.eq(User::getCompanyWechatId, companyWechatId)
|
|
|
.eq(User::getApplyType, UserTypeEnum.WORKER.getKey())
|
|
|
+ .isNotNull(User::getWorkerNumber)
|
|
|
// .eq(User::getStatus, true)
|
|
|
.list();
|
|
|
|
|
@@ -879,7 +880,7 @@ public class WebsitSalesLogic {
|
|
|
salesBean.setWebsitName(importMaterialSalesBean.getAdminWebsit().getName());
|
|
|
salesBean.setGoodsType(WebsitGoodsTypeEnum.M.getKey());
|
|
|
salesBean.setBuyPeople(isUser ? BuyPeopleEnum.WORKER.getKey() : BuyPeopleEnum.CUSTOMER.getKey());
|
|
|
- salesBean.setWorkerId(isUser ? importMaterialSalesBean.getUser().getUserId() : null);
|
|
|
+ salesBean.setWorkerId(isUser ? importMaterialSalesBean.getUser().getWorkerNumber() : null);
|
|
|
salesBean.setWorkerName(importMaterialSalesBean.getUser().getNickName());
|
|
|
salesBean.setWorkerMobile(importMaterialSalesBean.getUser().getMobile());
|
|
|
salesBean.setSalesType(WebsitSalesTypeEnum.RETAIL.getName());
|