玩湃
blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
puzhibing
2023-12-04 3ad6b6ba2ba56fc0bcd2130e47190779c6e15acc 
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java


@@ -218,14 +218,20 @@


                return res;


            case 2:


                // 运营商查询运营商账号的员工和属于该运营商门店的员工


                userQuery.setObjectType(2);


                userQuery.setObjectId(objectId);


                // 获取属于这个运营商的门店的店长ids


                List<Integer> storeStaffIds = storeService.list(new QueryWrapper<TStore>().eq("operatorId", objectId)


                        .ne("state", 3)).stream().map(TStore::getStoreStaffId).collect(Collectors.toList());


                userQuery.setStoreIds(storeStaffIds);


//                userQuery.setObjectType(2);


//                userQuery.setObjectId(objectId);


//                // 获取属于这个运营商的门店的店长ids


//                List<Integer> storeStaffIds = storeService.list(new QueryWrapper<TStore>().eq("operatorId", objectId)


//                        .ne("state", 3)).stream().map(TStore::getStoreStaffId).collect(Collectors.toList());


//                userQuery.setStoreIds(storeStaffIds);


//                List<UserListVO> res1= userService.searchUsers(userQuery);


                List<UserListVO> res1= userService.searchUsers(userQuery);


                return res1;


                List<UserListVO> filteredList = res1.stream()


                        .filter(vo -> Objects.equals(vo.getVersion(), UserExt.getUser().getId()))


                        .collect(Collectors.toList());




//                return res1;


                return filteredList;


            case 3:


                // 门店只查询门店员工


                TStore store = storeService.getById(objectId);


@@ -282,7 +288,13 @@


        user.setStatus(ManagerStatus.OK.getCode());


        user.setCreatetime(new Date());


        User objectUser = UserFactory.createUser(user);




        if (user.getRoleid().equals("")){


            objectUser.setObjectType(2);


        }else {


        objectUser.setObjectType(Integer.valueOf(user.getRoleid()));




        }


        objectUser.setObjectId(UserExt.getUser().getObjectId());


        objectUser.setRoleid(user.getRoleid());


        objectUser.setAccount(user.getPhone());


@@ -307,6 +319,7 @@


            objectUser.setRoleid("3");


            objectUser.setObjectId(UserExt.getUser().getObjectId());


        }


        objectUser.setVersion(UserExt.getUser().getId());


        this.userService.save(objectUser);


        return SUCCESS_TIP;


    }