Przeglądaj źródła

[用户管理][修复]

release_toaliyun_real
Stormeye.Wu 7 lat temu
rodzic
commit
d1f6c24f66
4 zmienionych plików z 44 dodań i 21 usunięć
  1. +9
    -8
      mallinkAdmin/src/main/java/com/iformall/controller/MallRoleController.java
  2. +23
    -13
      mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java
  3. +7
    -0
      mallinkService/src/main/java/com/iformall/service/MallRoleService.java
  4. +5
    -0
      mallinkService/src/main/java/com/iformall/service/impl/MallRoleServiceImpl.java

+ 9
- 8
mallinkAdmin/src/main/java/com/iformall/controller/MallRoleController.java Wyświetl plik

@@ -69,8 +69,8 @@ public class MallRoleController extends BaseController {
return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有超级管理员才能保存角色");
}
String tenantId = currentUser.getTenantId();
int count = sysRoleService.countByName(sysRole.getName(), sysRole.getId());
if (count > 0) {
int count = checkUnique(sysRole.getName(), tenantId);
if (sysRole.getId() == null && count > 0) {
return new ResultData(ResultData.ERROR, "角色名已存在");
}
sysRole.setTenantId(tenantId);
@@ -82,7 +82,6 @@ public class MallRoleController extends BaseController {
mIds.add(Long.valueOf(mId));
}
sysRolePermissionService.savePermissions(tenantId, sysRole.getId(), mIds.toArray(new Long[]{}));
;
}
return new ResultData();
}
@@ -95,7 +94,7 @@ public class MallRoleController extends BaseController {
return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有超级管理员才能添加角色");
}
Assert.notNull(sysRole.getName(), "角色名不能为空");
Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名");
Assert.isTrue(checkUnique(sysRole.getName(), currentUser.getTenantId())>0, "重复的角色名");
sysRoleService.saveOrUpdate(sysRole);
return new ResultData();
}
@@ -107,8 +106,7 @@ public class MallRoleController extends BaseController {
return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有超级管理员才能更新角色");
}
if (sysRole.getName() != null) {
System.out.println(checkUnique(sysRole.getName(), sysRole.getId()));
Assert.isTrue(!checkUnique(sysRole.getName(), sysRole.getId()), "角色名已存在");
Assert.isTrue(checkUnique(sysRole.getName(), currentUser.getTenantId())>1, "角色名已存在");
}
sysRoleService.saveOrUpdate(sysRole);
// Assert.notNull(sysRole.getName(), "角色名不能为空");
@@ -135,8 +133,11 @@ public class MallRoleController extends BaseController {
return new ResultData(Result.SUCCESS, "删除成功", null);
}

private boolean checkUnique(String name, Long id) {
return sysRoleService.countByName(name, id) > 0 ? true : false;
private int checkUnique(String name, String tenantId) {
MallRole role = new MallRole();
role.setName(name);
role.setTenantId(tenantId);
return sysRoleService.countList(role);
}

}

+ 23
- 13
mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java Wyświetl plik

@@ -94,10 +94,10 @@ public class MallUserInfoController extends BaseController {
return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有超级管理员才能添加用户");
}

if(checkUniqueName(userInfo.getUsername(), null)){
if(checkUniqueName(userInfo.getUsername(), currentUser.getTenantId()) > 0){
return new ResultData(ErrorCode.USER_NAME_IS_FOUND,"用户名已存在");
}
if(checkUniquePhone(userInfo.getPhone(), null)){
if(checkUniquePhone(userInfo.getPhone(), currentUser.getTenantId()) > 0){
return new ResultData(ErrorCode.USER_PHONE_IS_FOUND,"手机号已存在");
}
Assert.notNull(userInfo.getPassword(), "密码不能为空");
@@ -125,12 +125,16 @@ public class MallUserInfoController extends BaseController {
currentUser.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode()))) {
return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "超级管理员和自己才能修改信息");
}
//Assert.notNull(userInfo.getUsername(), "用户名不能为空");
if(checkUniqueName(userInfo.getUsername(), userInfo.getId())){
return new ResultData(ErrorCode.USER_NAME_IS_FOUND,"用户名已存在");
MallUserInfo oldUser = userInfoService.getById(userInfo.getId());
if (!oldUser.getUsername().equals(userInfo.getUsername())) {
if(checkUniqueName(userInfo.getUsername(), currentUser.getTenantId()) > 0){
return new ResultData(ErrorCode.USER_NAME_IS_FOUND,"用户名已存在");
}
}
if(checkUniquePhone(userInfo.getPhone(), userInfo.getId())){
return new ResultData(ErrorCode.USER_PHONE_IS_FOUND,"手机号已存在");
if (!oldUser.getPhone().equals(userInfo.getPhone())) {
if(checkUniquePhone(userInfo.getPhone(), currentUser.getTenantId()) > 0){
return new ResultData(ErrorCode.USER_PHONE_IS_FOUND,"手机号已存在");
}
}

userInfo.setTenantId(getTenantId());
@@ -150,8 +154,8 @@ public class MallUserInfoController extends BaseController {
adminUser.setPassword(userInfo.getPassword());
bModify = true;
}
if (StringUtils.isNotBlank(userInfo.getNickName())) {
adminUser.setNickName(userInfo.getNickName());
if (StringUtils.isNotBlank(userInfo.getUsername())) {
adminUser.setUsername(userInfo.getUsername());
}
if (bModify) {
userInfoService.saveOrUpdate(adminUser);
@@ -206,12 +210,18 @@ public class MallUserInfoController extends BaseController {
return new ResultData(userInfo);
}

private boolean checkUniqueName(String username, Long id) {
return userInfoService.cntByUserName(username,id);
private int checkUniqueName(String userName, String tenantId) {
MallUserInfo userQ = new MallUserInfo();
userQ.setUsername(userName);
userQ.setTenantId(tenantId);
return userInfoService.cntUserList(userQ);
}

private boolean checkUniquePhone(String phone, Long id) {
return userInfoService.cntByUserPhone(phone,id);
private int checkUniquePhone(String phone, String tenantId) {
MallUserInfo userQ = new MallUserInfo();
userQ.setPhone(phone);
userQ.setTenantId(tenantId);
return userInfoService.cntUserList(userQ);
}




+ 7
- 0
mallinkService/src/main/java/com/iformall/service/MallRoleService.java Wyświetl plik

@@ -16,6 +16,13 @@ public interface MallRoleService {
* @return
*/
PageInfo<MallRole> listAsPage(MallRole record, Integer pageIndex, Integer pageSize);

/**
* 根据实体查询count
* @param record
* @return
*/
int countList(MallRole record);
/**
* 根据Id获得实体


+ 5
- 0
mallinkService/src/main/java/com/iformall/service/impl/MallRoleServiceImpl.java Wyświetl plik

@@ -28,6 +28,11 @@ public class MallRoleServiceImpl implements MallRoleService {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> mallRoleMapper.findList(record));
}

@Override
public int countList(MallRole record) {
return mallRoleMapper.selectCount(record);
}

@Override
public MallRole getById(Long id) {
return mallRoleMapper.selectByPrimaryKey(id);


Ładowanie…
Anuluj
Zapisz