From 6f67eee1325143911bd41403a8c8b769a0cdfe2a Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期五, 26 七月 2024 15:45:30 +0800
Subject: [PATCH] 方重复
---
project-system/src/main/java/com/project/system/service/impl/SysUserServiceImpl.java | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 100 insertions(+), 13 deletions(-)
diff --git a/project-system/src/main/java/com/project/system/service/impl/SysUserServiceImpl.java b/project-system/src/main/java/com/project/system/service/impl/SysUserServiceImpl.java
index dfc53ff..a1994e4 100644
--- a/project-system/src/main/java/com/project/system/service/impl/SysUserServiceImpl.java
+++ b/project-system/src/main/java/com/project/system/service/impl/SysUserServiceImpl.java
@@ -1,5 +1,6 @@
package com.project.system.service.impl;
+import cn.hutool.core.convert.Convert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.project.common.annotation.DataScope;
@@ -15,6 +16,7 @@
import com.project.common.utils.bean.BeanValidators;
import com.project.common.utils.spring.SpringUtils;
import com.project.system.domain.*;
+import com.project.system.domain.bo.editBo.UserDeptBo;
import com.project.system.domain.vo.SysUserResultVo;
import com.project.system.domain.vo.SysUserVo;
import com.project.system.mapper.*;
@@ -55,6 +57,19 @@
private final ISysUserDeptService userDeptService;
private final ISysDeptService deptService;
protected final Validator validator;
+
+ /**
+ * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鐢ㄦ埛鍒楄〃
+ *
+ * @param user 鐢ㄦ埛淇℃伅
+ * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
+ */
+ @Override
+ @DataScope(deptAlias = "d", userAlias = "u")
+ public List<SysUser> selectUserListCommon(SysUser user)
+ {
+ return userMapper.selectUserListCommon(user);
+ }
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鐢ㄦ埛鍒楄〃
@@ -295,9 +310,9 @@
userPostMapper.deleteUserPostByUserId(userId);
// 鏂板鐢ㄦ埛涓庡矖浣嶇鐞�
insertUserPost(user);
-
+ SysUser old = this.selectUserById(userId);
// 鏂板鐢ㄦ埛涓庨儴闂ㄧ鐞�
- if (!"02".equals(user.getUserType())){
+ if (!"02".equals(user.getUserType()) && !old.getDeptId().equals(user.getDeptId())){
insertUserDept(user);
}
return userMapper.updateUser(user);
@@ -396,12 +411,20 @@
*/
public void insertUserDept(SysUser user)
{
- userDeptService.remove(userDeptService.lq()
- .eq(SysUserDept::getUserId, user.getUserId())
- .eq(SysUserDept::getDeptId, user.getDeptId())
- );
- SysUserDept userDept = new SysUserDept().setUserId(user.getUserId()).setDeptId(user.getDeptId());
- userDeptService.save(userDept);
+ if (deptService.getCheckDeptIdByLoginDeptId(user.getDeptId()).equals(user.getDeptId())) { //鍒嗙灞�鍐呮墍鏈夐儴闂�
+ List<SysDept> list = deptService.list(deptService.lq().eq(SysDept::getParentId, user.getDeptId()));
+ List<Long> deptIds = list.stream().map(SysDept::getDeptId).collect(Collectors.toList());
+ deptIds.add(user.getDeptId());
+ UserDeptBo bo = new UserDeptBo();
+ bo.setUserId(user.getUserId());
+ bo.setDeptIds(deptIds);
+ userDeptService.batchUserDeptSave(bo);
+ } else { //鍒嗙鍗曠嫭閮ㄩ棬
+ userDeptService.remove(userDeptService.lq().eq(SysUserDept::getUserId, user.getUserId()));
+ SysUserDept userDept = new SysUserDept().setUserId(user.getUserId()).setDeptId(user.getDeptId());
+ userDeptService.save(userDept);
+ }
+
}
/**
@@ -564,14 +587,14 @@
/**
* 鎵归噺鍒犻櫎鐢ㄦ埛淇℃伅
*
- * @param deptId 闇�瑕佸垹闄ょ殑鐢ㄦ埛ID
+ * @param phone 闇�瑕佸垹闄ょ殑鐢ㄦ埛ID
* @return 缁撴灉
*/
@Override
@Transactional
- public int deleteUserByDeptId(Long deptId)
+ public int deleteUserByCompanyPhone(String phone)
{
- List<SysUser> sysUsers = userMapper.selectList(new LambdaQueryWrapper<SysUser>().eq(SysUser::getDeptId, deptId));
+ List<SysUser> sysUsers = userMapper.selectList(new LambdaQueryWrapper<SysUser>().eq(SysUser::getPhonenumber, phone));
Long[] ids = sysUsers.stream().map(SysUser::getUserId).toArray(Long[]::new);
return this.deleteUserByIds(ids);
}
@@ -587,6 +610,12 @@
return userMapper.resetPhone(userId, phone);
}
+ /**
+ * 澶勭悊瀵煎叆鏁版嵁
+ * @param list 鏁版嵁
+ * @param deptId 瀵煎叆閮ㄩ棬id
+ * @return 缁撴灉
+ */
@Override
public SysUserResultVo doImport(List<SysUserVo> list, Long deptId)
{
@@ -602,6 +631,11 @@
return this.checkImport(resultVo);
}
+ /**
+ * 鏍￠獙瀵煎叆鏁版嵁
+ * @param resultVo 鏁版嵁
+ * @return 缁撴灉
+ */
@Override
public SysUserResultVo checkImport(SysUserResultVo resultVo)
{
@@ -616,6 +650,11 @@
return resultVo;
}
+ /**
+ * 楠岃瘉鍙傛暟
+ * @param entity 鏁版嵁
+ * @param errorList 閿欒鏁版嵁
+ */
private void validEntityBeforeImport(SysUserVo entity, List<ImportError> errorList)
{
if (StringUtils.isEmpty(entity.getNickName())){
@@ -644,10 +683,58 @@
}
}
}
+ if (StringUtils.isNotEmpty(entity.getEmail())){
+ SysUser check = new SysUser();
+ check.setPhonenumber(entity.getPhonenumber());
+ String s = checkEmailUnique(check);
+ if (UserConstants.NOT_UNIQUE.equals(s)) {
+ errorList.add(new ImportError(3, "閭宸插瓨鍦紒"));
+ }
+ }
+ if (StringUtils.isNotEmpty(entity.getImportSex())){
+ switch (entity.getImportSex().trim()){
+ case "鐢�":
+ entity.setSex("0");
+ break;
+ case "濂�":
+ entity.setSex("1");
+ break;
+ case "鏈煡":
+ entity.setSex("2");
+ break;
+ }
+ } else {
+ entity.setSex("2");
+ }
+ }
+
+ /**
+ * 淇濆瓨瀵煎叆缁撴灉
+ * @param resultVo 鏁版嵁
+ * @return 缁撴灉
+ */
+ @Override
+ @Transactional
+ public Boolean saveImport(SysUserResultVo resultVo)
+ {
+ if (resultVo==null || StringUtils.isEmpty(resultVo.getVoList())){
+ throw new BaseException("鏈幏鍙栧埌瀵煎叆淇℃伅锛�");
+ }
+ resultVo.getVoList().forEach(e-> {
+ if (StringUtils.isNotEmpty(e.getErrorList())) {
+ throw new BaseException("杩樻湁鏈鐞嗛敊璇俊鎭紒");
+ }
+ });
+ List<SysUser> users = Convert.toList(SysUser.class, resultVo.getVoList());
+ for (SysUser user : users) {
+ this.insertUser(user);
+ }
+ return true;
}
@Override
- public Boolean saveImport(SysUserResultVo resultVo) {
- return null;
+ public String getDeptNameByUserId(Long userId)
+ {
+ return deptService.selectDeptById(selectUserById(userId).getDeptId()).getDeptName();
}
}
--
Gitblit v1.9.1