111

crmeb-admin/src/main/java/com/zbkj/admin/controller/platform/NewPlatformApi.java

@@ -246,11 +246,9 @@ public class NewPlatformApi {
             userBypassAccount.setIsDelete(0);
             userBypassAccount.setDepartmentId(userBypassAccount.getDepartment());
             String realName = userBypassAccount.getRealName();
-            OrganizationDepartmentUser organizationDepartmentUser = organizationDepartmentUserService.getById(realName);
-            userBypassAccount.setRealName(organizationDepartmentUser.getName());
+            userBypassAccount.setRealName(realName);
             String department = userBypassAccount.getDepartment();
-            OrganizationDepartment organizationDepartment = organizationDepartmentService.getById(department);
-            userBypassAccount.setDepartment(organizationDepartment.getName());
+            userBypassAccount.setDepartment(department);
 
 
             LambdaQueryWrapper<UserBypassAccount> queryWrapper = new LambdaQueryWrapper<>();
@@ -669,12 +667,23 @@ public class NewPlatformApi {
 
     @ApiOperation(value = "平台端用户列表")
     @RequestMapping(value = "/otganizatonDepartmentUserList", method = RequestMethod.GET)
-    public CommonResult<?> otganizatonDepartmentlist(@RequestParam(name = "id", required = true) String id) {
-        LambdaQueryWrapper<OrganizationDepartmentUser> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(OrganizationDepartmentUser::getDepartmentId, id);
-//        Page<OrganizationDepartmentUser> page = PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
-        List<OrganizationDepartmentUser> list = organizationDepartmentUserService.list(queryWrapper);
-        return CommonResult.success(list);
+    public CommonResult<?> otganizatonDepartmentlist(@RequestParam(name = "id", required = true) String id,
+                                                     @RequestParam(name = "organizationId", required = true) String organizationId
+    ) {
+        ArrayList<OrganizationDepartmentUser> organizationDepartmentUsers = new ArrayList<>();
+        LambdaQueryWrapper<OrganizationDepartment> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(OrganizationDepartment::getName, id);
+        queryWrapper.eq(OrganizationDepartment::getOrganizationId, organizationId);
+        List<OrganizationDepartment> list = organizationDepartmentService.list(queryWrapper);
+        for (OrganizationDepartment organizationDepartment : list) {
+            String departmentUserId = organizationDepartment.getId();
+            List<OrganizationDepartmentUser> organizationDepartmentUsers1 = organizationDepartmentUserService.selectMainBydepartmentId(departmentUserId);
+            for (OrganizationDepartmentUser departmentUser : organizationDepartmentUsers1) {
+                organizationDepartmentUsers.add(departmentUser);
+            }
+        }
+
+        return CommonResult.success(organizationDepartmentUsers);
 
     }