|
|
@ -7,8 +7,9 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
import org.springframework.transaction.interceptor.TransactionAspectSupport;
|
|
|
|
import org.springframework.transaction.interceptor.TransactionAspectSupport;
|
|
|
|
import ${basePackage}.frame.base.ErrorType;
|
|
|
|
import ${basePackage}.frame.auth.LocalData;
|
|
|
|
import ${basePackage}.frame.auth.Token;
|
|
|
|
import ${basePackage}.frame.auth.Token;
|
|
|
|
|
|
|
|
import ${basePackage}.frame.base.ErrorType;
|
|
|
|
import ${basePackage}.frame.utils.IDgenerator;
|
|
|
|
import ${basePackage}.frame.utils.IDgenerator;
|
|
|
|
import ${basePackage}.frame.utils.MD5Util;
|
|
|
|
import ${basePackage}.frame.utils.MD5Util;
|
|
|
|
import ${basePackage}.frame.utils.MapperUtil;
|
|
|
|
import ${basePackage}.frame.utils.MapperUtil;
|
|
|
@ -75,6 +76,14 @@ public class UserManagerImpl implements UserManager {
|
|
|
|
entity.setId(id);
|
|
|
|
entity.setId(id);
|
|
|
|
entity.setUserPwd(MD5Util.generatePwd(entity.getUserPwd()));
|
|
|
|
entity.setUserPwd(MD5Util.generatePwd(entity.getUserPwd()));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
{// 检查是否与设置的超级管理员账户相同
|
|
|
|
|
|
|
|
String admin = LocalData.getEnvironment().getProperty("web.url.auth.admin", "admin");
|
|
|
|
|
|
|
|
if (admin.equals(request.getUserName())) {
|
|
|
|
|
|
|
|
response.addError(ErrorType.BUSINESS_ERROR, "[" + request.getUserName() + "]用户名已被超级管理员占用");
|
|
|
|
|
|
|
|
return response;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
{
|
|
|
|
DeptFindRequest deptFindRequest = new DeptFindRequest();
|
|
|
|
DeptFindRequest deptFindRequest = new DeptFindRequest();
|
|
|
|
deptFindRequest.setDeptCode(request.getDeptCode());
|
|
|
|
deptFindRequest.setDeptCode(request.getDeptCode());
|
|
|
|