From eb49564ab17c6695d8928d5a63a57c58b3cfd79c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 18:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
index 263c9d0..bf8ef74 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
@@ -7,6 +7,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.model.Company;
import com.doumee.dao.system.SystemUserJoinMapper;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.dto.QuerySystemUserDTO;
@@ -14,6 +15,7 @@
import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.system.vo.SystemDepartmentListVO;
import com.doumee.dao.system.vo.SystemUserListVO;
+import com.doumee.dao.system.vo.UserResponse;
import com.doumee.service.aware.DepartmentDataPermissionAware;
import com.doumee.service.system.SystemDepartmentService;
import com.doumee.service.system.SystemPositionService;
@@ -30,6 +32,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -111,8 +114,8 @@
@Override
public SystemUser findOne(SystemUser systemUser) {
- Wrapper<SystemUser> wrapper = new QueryWrapper<>(systemUser);
- return systemUserMapper.selectOne(wrapper);
+ QueryWrapper<SystemUser> wrapper = new QueryWrapper<SystemUser>(systemUser);
+ return systemUserMapper.selectOne(wrapper.lambda().last("limit 1"));
}
@Override
@@ -120,17 +123,33 @@
Wrapper<SystemUser> wrapper = new QueryWrapper<>(systemUser);
return systemUserMapper.selectList(wrapper);
}
+
+ @Override
+ public List<UserResponse> getUserList(Integer bookingsId) {
+ return systemUserMapper.getUserList(new QueryWrapper<UserResponse>()
+ .exists(" select 1 from meeting_user_rel u where u.USER_ID = c.id and u.ISDELETED = 0 and u.OBJ_ID = "+bookingsId+" and u.OBJ_TYPE = 1 ")
+ );
+ }
@Override
public PageData<SystemUserListVO> findPage(PageWrap<QuerySystemUserDTO> pageWrap) {
// 鏍归儴闂ㄦ潯浠跺鐞嗭紙闇�鏌ヨ鏍归儴闂ㄤ笅鎵�鏈夐儴闂ㄧ殑鐢ㄦ埛锛�
- if (pageWrap.getModel().getRootDeptId() != null) {
+ /* if (pageWrap.getModel().getRootDeptId() != null) {
pageWrap.getModel().setDepartmentIds(getDeptIds(pageWrap.getModel().getRootDeptId()));
} else {
List<SystemDepartment> list = systemDepartmentService.findList(new QueryWrapper<>());
List<Integer> collect = list.stream().map(s -> s.getId()).collect(Collectors.toList());
pageWrap.getModel().setDepartmentIds(collect);
+ }*/
+
+ //鏌ヨ鐗规畩鐨�42浜洪厤缃�
+ if(Objects.nonNull(pageWrap.getModel()) && Constants.equalsInteger(pageWrap.getModel().getQuerySpecial(),Constants.ONE)){
+ String companySpecialId = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SPECIAL_COMPANY_ID).getCode();
+ if(StringUtils.isNotBlank(companySpecialId)){
+ pageWrap.getModel().setCompanySpecialId(companySpecialId);
+ }
}
+
// 鎵ц鏌ヨ
PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity());
List<SystemUserListVO> userList = systemUserMapper.selectManageList(pageWrap.getModel(), pageWrap.getOrderByClause());
@@ -198,8 +217,6 @@
@Override
public List<SystemUser> findAllList(SystemUser pageWrap) {
-
-
MPJLambdaWrapper<SystemUser> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap);
queryWrapper.selectAll(SystemUser.class);
@@ -209,11 +226,7 @@
.or().like(SystemUser::getRealname,pageWrap.getUsername())
);
queryWrapper.orderByDesc(SystemUser::getCreateTime);
-
-
-
List<SystemUser> result = systemUserJoinMapper.selectJoinList( SystemUser.class, queryWrapper);
-
return result;
}
@@ -221,5 +234,17 @@
+ @Override
+ public List<SystemUser> findInternalList() {
+ MPJLambdaWrapper<SystemUser> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAll(SystemUser.class);
+ queryWrapper.eq(SystemUser::getDeleted, Constants.ZERO);
+ queryWrapper.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId);
+ queryWrapper.eq(Company::getType,Constants.ONE);
+ queryWrapper.orderByDesc(SystemUser::getCreateTime);
+ List<SystemUser> result = systemUserJoinMapper.selectJoinList( SystemUser.class, queryWrapper);
+ return result;
+ }
+
}
--
Gitblit v1.9.3