定时任务发送手机号修改

crmeb-front/src/main/java/com/zbkj/front/controller/NewFrontApi.java

@@ -264,7 +264,7 @@ public class NewFrontApi {
             }
         }
 
-        queryWrapper2.eq(UserBypassAccount::getEnterpriseId, id);
+       queryWrapper2.eq(UserBypassAccount::getEnterpriseId, id);
 
         if (!department.equals("")) {
             String[] departments = department.split(",");
@@ -533,18 +533,8 @@ public class NewFrontApi {
     public CommonResult<?> departUser(@RequestParam(name = "departmentId", required = false) String departmentId,
                                       @RequestParam(name = "organizationId", required = false) String organizationId
     ) {
-        List<UserBypassAccount> list = new ArrayList<>();
-        if (StringUtils.isNotBlank(organizationId)) {
-            LambdaQueryWrapper<UserEnterprise> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(UserEnterprise::getOrganizationId, organizationId);
-            UserEnterprise userEnterprise = userEnterpriseService.getOne(queryWrapper);
-            Integer id = userEnterprise.getId();
-            LambdaQueryWrapper<UserBypassAccount> queryWrapper2 = new LambdaQueryWrapper<>();
-            queryWrapper2.eq(UserBypassAccount::getEnterpriseId, id);
-            queryWrapper2.eq(UserBypassAccount::getIsDelete, 0);
-            list = userBypassAccountService.list(queryWrapper2);
-        }
         if (StringUtils.isNotBlank(departmentId)) {
+            List<UserBypassAccount> list = new ArrayList<>();
             String[] split = departmentId.split(",");
             LambdaQueryWrapper<OrganizationDepartment> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.in(OrganizationDepartment::getId, split);
@@ -564,10 +554,24 @@ public class NewFrontApi {
                 for (UserBypassAccount userBypassAccount : list1) {
                     list.add(userBypassAccount);
                 }
-
             }
+            return CommonResult.success(list);
         }
-        return CommonResult.success(list);
+        else if (StringUtils.isNotBlank(organizationId)) {
+            LambdaQueryWrapper<UserEnterprise> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(UserEnterprise::getOrganizationId, organizationId);
+            UserEnterprise userEnterprise = userEnterpriseService.getOne(queryWrapper);
+            Integer id = userEnterprise.getId();
+            LambdaQueryWrapper<UserBypassAccount> queryWrapper2 = new LambdaQueryWrapper<>();
+            queryWrapper2.eq(UserBypassAccount::getEnterpriseId, id);
+            queryWrapper2.eq(UserBypassAccount::getIsDelete, 0);
+            List<UserBypassAccount> list1 = userBypassAccountService.list(queryWrapper2);
+            return CommonResult.success(list1);
+        }
+
+
+
 
+        return CommonResult.success("部门下用户为空");
     }
 }

crmeb-front/src/main/java/com/zbkj/front/service/impl/FrontOrderServiceImpl.java

@@ -1043,16 +1043,29 @@ public class FrontOrderServiceImpl implements FrontOrderService {
                 LambdaQueryWrapper<UserBypassAccount> queryWrapper2 = new LambdaQueryWrapper<>();
                 queryWrapper2.eq( UserBypassAccount::getUserId, order.getUid() );
                 queryWrapper2.eq( UserBypassAccount::getIsDelete, 0 );
-                UserBypassAccount one1 = userBypassAccountService.getOne( queryWrapper2, false );
+                UserBypassAccount one1 = userBypassAccountService.getOne( queryWrapper2 );
                 if (one1 != null) {
                     infoResponse.setName( one1.getRealName() );
                     infoResponse.setBum( one1.getDepartment() );
                     infoResponse.setPhone( one1.getPhone() );
+                }else{
+                    LambdaQueryWrapper<UserEnterprise> queryWrapper3 = new LambdaQueryWrapper<>();
+                    queryWrapper3.eq( UserEnterprise::getUserId, order.getUid() );
+                    queryWrapper3.eq( UserEnterprise::getIsDelete, 0 );
+                    UserEnterprise one2 = userEnterpriseService.getOne( queryWrapper3 );
+                    infoResponse.setName( one2.getRealName() );
+                    infoResponse.setBum( "主账号");
+                    infoResponse.setPhone( one2.getPhone() );
+
                 }
             } else {
                 //企业用户
                 LambdaQueryWrapper<UserEnterprise> queryWrapper = new LambdaQueryWrapper<>();
-                queryWrapper.eq( UserEnterprise::getUserId, order.getUid() );
+                Integer uid = order.getUid();
+                LambdaQueryWrapper<UserBypassAccount> userBypassAccountLambdaQueryWrapper = new LambdaQueryWrapper<>();
+                userBypassAccountLambdaQueryWrapper.eq(UserBypassAccount::getUserId,uid);
+                UserBypassAccount userBypassAccount = userBypassAccountService.getOne(userBypassAccountLambdaQueryWrapper);
+                queryWrapper.eq( UserEnterprise::getId, userBypassAccount.getEnterpriseId() );
                 queryWrapper.eq( UserEnterprise::getIsDelete, 0 );
                 UserEnterprise one = userEnterpriseService.getOne( queryWrapper, false );
                 if (one != null) {