lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
@@ -169,6 +169,68 @@
        return result;
    }
    /**
     * 获取用户列表数据
     * @param user
     * @param req
     * @return
     */
    @RequestMapping(value = "/listAll", method = RequestMethod.GET)
    public Result<List<SysUser>> listAll(SysUser user,HttpServletRequest req) {
        Result<List<SysUser>> result = new Result<List<SysUser>>();
        QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap());
        //update-begin-Author:wangshuai--Date:20211119--for:【vue3】通过部门id查询用户,通过code查询id
        //部门ID
        String departId = req.getParameter("departId");
        if(oConvertUtils.isNotEmpty(departId)){
            LambdaQueryWrapper<SysUserDepart> query = new LambdaQueryWrapper<>();
            query.eq(SysUserDepart::getDepId,departId);
            List<SysUserDepart> list = sysUserDepartService.list(query);
            List<String> userIds = list.stream().map(SysUserDepart::getUserId).collect(Collectors.toList());
            //update-begin---author:wangshuai ---date:20220322  for:[issues/I4XTYB]查询用户时,当部门id 下没有分配用户时接口报错------------
            if(oConvertUtils.listIsNotEmpty(userIds)){
                queryWrapper.in("id",userIds);
            }else{
                return Result.OK();
            }
            //update-end---author:wangshuai ---date:20220322  for:[issues/I4XTYB]查询用户时,当部门id 下没有分配用户时接口报错------------
        }
        //用户ID
        String code = req.getParameter("code");
        if(oConvertUtils.isNotEmpty(code)){
            queryWrapper.in("id",Arrays.asList(code.split(",")));
        }
        //update-end-Author:wangshuai--Date:20211119--for:【vue3】通过部门id查询用户,通过code查询id
        //update-begin-author:taoyan--date:20220104--for: JTC-372 【用户冻结问题】 online授权、用户组件,选择用户都能看到被冻结的用户
        String status = req.getParameter("status");
        if(oConvertUtils.isNotEmpty(status)){
            queryWrapper.eq("status", Integer.parseInt(status));
        }
        //update-end-author:taoyan--date:20220104--for: JTC-372 【用户冻结问题】 online授权、用户组件,选择用户都能看到被冻结的用户
        //TODO 外部模拟登陆临时账号,列表不显示
        queryWrapper.ne("username","_reserve_user_external");
        List<SysUser> list = sysUserService.list(queryWrapper);
        //批量查询用户的所属部门
        //step.1 先拿到全部的 useids
        //step.2 通过 useids,一次性查询用户的所属部门名字
        List<String> userIds = list.stream().map(SysUser::getId).collect(Collectors.toList());
        Map<String, String> useProNames = sysUserService.getProNamesByUserIds(userIds);
        if(userIds!=null && userIds.size()>0){
            Map<String,String>  useDepNames = sysUserService.getDepNamesByUserIds(userIds);
            list.forEach(item->{
                item.setOrgCodeTxt(useDepNames.get(item.getId()));
                item.setProductionName(useProNames.get(item.getId()));
            });
        }
        result.setSuccess(true);
        result.setResult(list);
        log.info(list.toString());
        return result;
    }
    //@RequiresRoles({"admin"})
    //Permissions("system:user:add")
    @RequestMapping(value = "/add", method = RequestMethod.POST)