From 1e4e6a526682ddcd62378b1f2975e7d4b4b2de4f Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期一, 17 七月 2023 17:07:12 +0800
Subject: [PATCH] 用户模块修改
---
src/main/java/com/gk/hotwork/Service/ServiceImpl/UserServiceImpl.java | 84 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 84 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/gk/hotwork/Service/ServiceImpl/UserServiceImpl.java b/src/main/java/com/gk/hotwork/Service/ServiceImpl/UserServiceImpl.java
index 5cdcabc..fe91ae2 100644
--- a/src/main/java/com/gk/hotwork/Service/ServiceImpl/UserServiceImpl.java
+++ b/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);
@@ -438,4 +518,8 @@
public UserInfo getByUserId(Long userId) {
return userInfoMapper.getByUserId(userId);
}
+
+
+
+
}
--
Gitblit v1.9.2