From 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期一, 12 四月 2021 15:44:53 +0800
Subject: [PATCH] Merge branch '20210406-maqv2' into 20210412-youhua
---
src/main/java/com/ots/project/exam/service/impl/SysUserExtendServiceImpl.java | 70 ++++-------------------------------
1 files changed, 8 insertions(+), 62 deletions(-)
diff --git a/src/main/java/com/ots/project/exam/service/impl/SysUserExtendServiceImpl.java b/src/main/java/com/ots/project/exam/service/impl/SysUserExtendServiceImpl.java
index 90bf821..686c8d1 100644
--- a/src/main/java/com/ots/project/exam/service/impl/SysUserExtendServiceImpl.java
+++ b/src/main/java/com/ots/project/exam/service/impl/SysUserExtendServiceImpl.java
@@ -1,5 +1,4 @@
package com.ots.project.exam.service.impl;
-
import com.ots.common.enums.OpertypeEnum;
import com.ots.common.utils.StringUtils;
import com.ots.common.utils.file.FileUploadUtils;
@@ -18,24 +17,15 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
-
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
-
import static com.ots.common.enums.UserTypeEnum.DIS_USER;
import static com.ots.common.enums.UserTypeEnum.SYS_USER;
-/**
- * 鐢ㄦ埛淇℃伅鎵╁睍Service涓氬姟灞傚鐞�
- *
- * @author ots
- * @date 2019-11-20
- */
@Service
public class SysUserExtendServiceImpl implements ISysUserExtendService {
-
@Autowired
private SysUserExtendMapper sysUserExtendMapper;
@Autowired
@@ -46,38 +36,19 @@
private EntOperLogServiceImpl entOperLogService;
@Autowired
private PasswordService passwordService;
-
- /**
- * 鏌ヨ鐢ㄦ埛淇℃伅鎵╁睍
- *
- * @param userId 鐢ㄦ埛淇℃伅鎵╁睍ID
- * @return 鐢ㄦ埛淇℃伅鎵╁睍
- */
+
@Override
public SysUserExtend selectSysUserExtendById(Long userId) {
return sysUserExtendMapper.selectSysUserExtendById(userId);
}
-
- /**
- * 鏌ヨ鐢ㄦ埛淇℃伅鎵╁睍鍒楄〃
- *
- * @param sysUserExtend 鐢ㄦ埛淇℃伅鎵╁睍
- * @return 鐢ㄦ埛淇℃伅鎵╁睍
- */
+
@Override
public List<SysUserExtend> selectSysUserExtendList(SysUserExtend sysUserExtend) {
return sysUserExtendMapper.selectSysUserExtendList(sysUserExtend);
}
-
- /**
- * 鏂板鐢ㄦ埛淇℃伅鎵╁睍
- *
- * @param sysUserExtend 鐢ㄦ埛淇℃伅鎵╁睍
- * @return 缁撴灉
- */
+
@Override
public int insertSysUserExtend(SysUserExtend sysUserExtend) {
-
MultipartFile businessLicenseFile = sysUserExtend.getBusinessLicenseFile();
if (businessLicenseFile != null && !businessLicenseFile.isEmpty()) {
try {
@@ -96,7 +67,6 @@
e.printStackTrace();
}
}
-
if (StringUtils.isNotBlank(sysUserExtend.getLoginName())) {
User user = new User();
user.setLoginName(sysUserExtend.getLoginName());
@@ -130,13 +100,7 @@
}
return sysUserExtendMapper.insertSysUserExtend(sysUserExtend);
}
-
- /**
- * 淇敼鐢ㄦ埛淇℃伅鎵╁睍
- *
- * @param sysUserExtend 鐢ㄦ埛淇℃伅鎵╁睍
- * @return 缁撴灉
- */
+
@Override
public int updateSysUserExtend(SysUserExtend sysUserExtend) {
MultipartFile businessLicenseFile = sysUserExtend.getBusinessLicenseFile();
@@ -176,7 +140,6 @@
user.setPhonenumber(sysUserExtend.getPhonenumber());
this.userMapper.updateUser(user);
}
-
Long userId = sysUserExtend.getUserId();
User user = userMapper.selectUserById(userId);
if (user.getUserType().equals(DIS_USER.getUserType()) && !Objects.equals("1",sysUserExtend.getFirstLevel())) {
@@ -184,9 +147,8 @@
e.setRoleId(4L);
e.setUserId(user.getUserId());
List<UserRole> rs = Arrays.asList(e);
- this.userRoleMapper.deleteUserRoleInfo(e);//鍏堝垹闄わ紝鍐嶆柊澧�
+ this.userRoleMapper.deleteUserRoleInfo(e);
this.userRoleMapper.batchUserRole(rs);
-
UserRole de = new UserRole();
de.setRoleId(6L);
de.setUserId(user.getUserId());
@@ -196,39 +158,24 @@
e.setRoleId(6L);
e.setUserId(sysUserExtend.getUserId());
List<UserRole> rs = Arrays.asList(e);
- this.userRoleMapper.deleteUserRoleInfo(e);//鍏堝垹闄わ紝鍐嶆柊澧�
+ this.userRoleMapper.deleteUserRoleInfo(e);
this.userRoleMapper.batchUserRole(rs);
-
UserRole de = new UserRole();
de.setRoleId(4L);
de.setUserId(user.getUserId());
userRoleMapper.deleteUserRoleInfo(de);
}
-
return sysUserExtendMapper.updateSysUserExtend(sysUserExtend);
}
-
- /**
- * 鍒犻櫎鐢ㄦ埛淇℃伅鎵╁睍瀵硅薄
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
+
@Override
public int deleteSysUserExtendByIds(String ids) {
return sysUserExtendMapper.deleteSysUserExtendByIds(Convert.toStrArray(ids));
}
-
- /**
- * 鍒犻櫎鐢ㄦ埛淇℃伅鎵╁睍淇℃伅
- *
- * @param userId 鐢ㄦ埛淇℃伅鎵╁睍ID
- * @return 缁撴灉
- */
+
public int deleteSysUserExtendById(Long userId) {
return sysUserExtendMapper.deleteSysUserExtendById(userId);
}
-
@Override
@Transactional
public int updateTestNum(Long userId, Long addNum) {
@@ -239,7 +186,6 @@
entOperLogService.saveLog(userId, String.valueOf(ShiroUtils.getSysUser().getUserId()), OpertypeEnum.SYS_USER, addNum);
return result;
}
-
@Override
public int resetpwd(User user) {
user.randomSalt();
--
Gitblit v1.9.1