|
|
@@ -294,10 +294,6 @@ public class UserLogic {
|
|
|
@Transactional
|
|
|
public void localUpdateInner(HttpServletRequest request, MultipartFile multipartFile) throws IOException {
|
|
|
final AdminUserCom adminUser = commonLogic.getAdminUser(request);
|
|
|
- String loginCompanyWechatId = adminUser.getLoginCompanyWechatId();
|
|
|
- if(StringUtils.isEmpty(loginCompanyWechatId)){
|
|
|
- throw new RemoteServiceException("无效企业微信id");
|
|
|
- }
|
|
|
|
|
|
List<Object> objects = ExcelUtils.importExcel(multipartFile);
|
|
|
List<User> phoneList = new ArrayList<>();
|
|
|
@@ -344,7 +340,6 @@ public class UserLogic {
|
|
|
.in(User::getMobile, phoneList.stream()
|
|
|
.map(User::getMobile)
|
|
|
.collect(Collectors.toList()))
|
|
|
- .eq(User::getCompanyWechatId, loginCompanyWechatId)
|
|
|
.eq(User::getType, UserTypeEnum.GENERAL)
|
|
|
.eq(User::getStatus, true)
|
|
|
.list();
|
|
|
@@ -383,7 +378,6 @@ public class UserLogic {
|
|
|
|
|
|
// 获取已存在记录
|
|
|
final List<UserServiceWait> existWaits = userServiceWaitService.lambdaQuery()
|
|
|
- .eq(UserServiceWait::getCompanyWechatId, loginCompanyWechatId)
|
|
|
.in(UserServiceWait::getMobile, phoneList.stream().map(User::getMobile).collect(Collectors.toList()))
|
|
|
.list();
|
|
|
Map<String, UserServiceWait> waitMap = existWaits.stream().collect(Collectors.toMap(UserServiceWait::getMobile, Function.identity()));
|
|
|
@@ -407,7 +401,6 @@ public class UserLogic {
|
|
|
.setWorkerId(waitUser.getWorkUserId())
|
|
|
.setCreateTime(curDate)
|
|
|
.setCreateBy(adminUser.getNickName())
|
|
|
- .setCompanyWechatId(loginCompanyWechatId)
|
|
|
.setCompanyName(adminUser.getCompanyName());
|
|
|
waitList.add(wait);
|
|
|
}
|
|
|
@@ -433,7 +426,6 @@ public class UserLogic {
|
|
|
.in(User::getMobile, innerPhoneList.stream()
|
|
|
.map(User::getMobile)
|
|
|
.collect(Collectors.toList()))
|
|
|
- .eq(User::getCompanyWechatId, loginCompanyWechatId)
|
|
|
.eq(User::getType, UserTypeEnum.SERVICE)
|
|
|
.eq(User::getStatus, true)
|
|
|
.update();
|
‘linchangsheng’