Merge branch 'master' of https://sinanoaq.cn:8888/r/hazardInvestigationSyst...

zf

2023-08-30 9ca0dc6e7833715b875cc9b6b91d5c497b2bae8b

 src/main/java/com/gk/hotwork/Service/ServiceImpl/UserServiceImpl.java

@@ -75,6 +75,86 @@
    }

    @Override
    public void selectCompanyUserDataGrid(PageInfo pageInfo) {
        Page<UserVo> page = new Page<>(pageInfo.getPageIndex(), pageInfo.getPageSize());
        List<OrderItem> orderItems = new ArrayList<>();
        OrderItem orderItem = new OrderItem();
        if (StringUtils.isNotBlank(pageInfo.getSort()) && StringUtils.isNotBlank(pageInfo.getOrder())) {
            orderItem.setAsc(pageInfo.getOrder().equalsIgnoreCase("ascending"));
            orderItem.setColumn(pageInfo.getSort());
        }else {
            orderItem.setAsc(false);
            orderItem.setColumn("createddate");
        }
        orderItems.add(orderItem);
        page.setOrders(orderItems);
        List<UserVo> list = userInfoMapper.selectCompanyUserDataList(page,pageInfo.getCondition());
        for (UserVo userVo : list) {
            List<RoleInfo> roleInfoList = roleService.selectRoleByUser(userVo.getId());
            userVo.setRoles(roleInfoList);
            UserFace userFace = userFaceService.selectByUserId(userVo.getId());
            if (userFace != null)
                userVo.setCode(userFace.getCode());
        }
        pageInfo.setResult(list);
        pageInfo.setTotalCount(page.getTotal());
    }
    @Override
    public void selectSuperviseUserDataGrid(PageInfo pageInfo) {
        Page<UserVo> page = new Page<>(pageInfo.getPageIndex(), pageInfo.getPageSize());
        List<OrderItem> orderItems = new ArrayList<>();
        OrderItem orderItem = new OrderItem();
        if (StringUtils.isNotBlank(pageInfo.getSort()) && StringUtils.isNotBlank(pageInfo.getOrder())) {
            orderItem.setAsc(pageInfo.getOrder().equalsIgnoreCase("ascending"));
            orderItem.setColumn(pageInfo.getSort());
        }else {
            orderItem.setAsc(false);
            orderItem.setColumn("createddate");
        }
        orderItems.add(orderItem);
        page.setOrders(orderItems);
        List<UserVo> list = userInfoMapper.selectSuperviseUserDataList(page,pageInfo.getCondition());
        for (UserVo userVo : list) {
            List<RoleInfo> roleInfoList = roleService.selectRoleByUser(userVo.getId());
            userVo.setRoles(roleInfoList);
            UserFace userFace = userFaceService.selectByUserId(userVo.getId());
            if (userFace != null)
                userVo.setCode(userFace.getCode());
        }
        pageInfo.setResult(list);
        pageInfo.setTotalCount(page.getTotal());
    }
    @Override
    public void selectExpertUserDataGrid(PageInfo pageInfo) {
        Page<UserVo> page = new Page<>(pageInfo.getPageIndex(), pageInfo.getPageSize());
        List<OrderItem> orderItems = new ArrayList<>();
        OrderItem orderItem = new OrderItem();
        if (StringUtils.isNotBlank(pageInfo.getSort()) && StringUtils.isNotBlank(pageInfo.getOrder())) {
            orderItem.setAsc(pageInfo.getOrder().equalsIgnoreCase("ascending"));
            orderItem.setColumn(pageInfo.getSort());
        }else {
            orderItem.setAsc(false);
            orderItem.setColumn("createddate");
        }
        orderItems.add(orderItem);
        page.setOrders(orderItems);
        List<UserVo> list = userInfoMapper.selectExpertUserDataList(page,pageInfo.getCondition());
        for (UserVo userVo : list) {
            List<RoleInfo> roleInfoList = roleService.selectRoleByUser(userVo.getId());
            userVo.setRoles(roleInfoList);

        }
        pageInfo.setResult(list);
        pageInfo.setTotalCount(page.getTotal());
    }

    @Override
    public List<UserInfo> selectExpertList(String realname) {
        List<UserInfo> userInfos = userInfoMapper.selectExpertList(realname);
        return userInfos;
    }

    @Override
    public UserInfo selectByUser(String username) {
        UserInfo userInfo = new UserInfo();
        userInfo.setUsername(username);
@@ -100,6 +180,10 @@
    @Override
    public UserVo selectUserVoByName(String examtype,String username) {
        return userInfoMapper.selectUserVoByName(examtype,username);
    }
    @Override
    public UserVo selectUserVoById(Long userId) {
        return userInfoMapper.selectUserVoById(userId);
    }


@@ -438,4 +522,8 @@
    public UserInfo getByUserId(Long userId) {
        return userInfoMapper.getByUserId(userId);
    }




}