|
@@ -24,10 +24,7 @@ import com.qmth.sop.business.util.AuthUtil;
|
|
|
import com.qmth.sop.common.contant.SpringContextHolder;
|
|
|
import com.qmth.sop.common.contant.SystemConstant;
|
|
|
import com.qmth.sop.common.enums.*;
|
|
|
-import com.qmth.sop.common.util.IpUtil;
|
|
|
-import com.qmth.sop.common.util.ResultUtil;
|
|
|
-import com.qmth.sop.common.util.ServletUtil;
|
|
|
-import com.qmth.sop.common.util.SessionUtil;
|
|
|
+import com.qmth.sop.common.util.*;
|
|
|
import org.springframework.dao.DuplicateKeyException;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
@@ -302,9 +299,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
public Boolean saveUser(SysUser sysUser, SysUser requestUser) {
|
|
|
SysUserService sysUserService = SpringContextHolder.getBean(SysUserService.class);
|
|
|
try {
|
|
|
- if (Objects.isNull(requestUser)) {
|
|
|
- requestUser = (SysUser) ServletUtil.getRequestUser();
|
|
|
- }
|
|
|
+ requestUser = Objects.isNull(requestUser) ? (SysUser) ServletUtil.getRequestUser() : requestUser;
|
|
|
if (Objects.isNull(sysUser.getId())) {//新增用户
|
|
|
sysUser.insertInfo(requestUser.getId());
|
|
|
sysUser.setPasswordInfo(sysUser.getMobileNumber());
|
|
@@ -313,7 +308,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
} else {//修改用户
|
|
|
SysUser dbUser = this.getById(sysUser.getId());
|
|
|
Optional.ofNullable(dbUser).orElseThrow(() -> ExceptionResultEnum.USER_NO_EXISTS.exception());
|
|
|
- sysUser.setPassword(dbUser.getPassword());
|
|
|
+ sysUser.setPasswordInfo(sysUser.getMobileNumber());
|
|
|
|
|
|
List<SysUserRole> sysUserRoleList = commonCacheService.userRolePrivilegeCache(sysUser.getId());
|
|
|
List<Long> userRolesList = Arrays.asList(sysUser.getRoleIds());
|