Kaynağa Gözat

[系统管理员][修改]:超级管理员改为系统管理员

release_toaliyun_real
Stormeye Wu 7 yıl önce
ebeveyn
işleme
dcb150daa0
10 değiştirilmiş dosya ile 25 ekleme ve 23 silme
  1. +4
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java
  2. +5
    -5
      mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java
  3. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/common/ErrorCode.java
  5. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java
  6. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java
  7. +1
    -1
      mallinkService/src/main/java/com/iformall/utils/Constant.java
  8. +4
    -4
      mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java
  9. +5
    -5
      mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java
  10. +1
    -1
      mallinkSysAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java

+ 4
- 4
mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java Dosyayı Görüntüle

@@ -84,7 +84,7 @@ public class MallRoleController extends BaseController {
logger.debug("[" + getIpAddr() + "] MallRoleController::saveOrUpdate"); logger.debug("[" + getIpAddr() + "] MallRoleController::saveOrUpdate");
MallUserInfo currentUser = getUser(); MallUserInfo currentUser = getUser();
if(currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) { if(currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) {
return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有超级管理员才能保存角色");
return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有系统管理员才能保存角色");
} }
String tenantId = currentUser.getTenantId(); String tenantId = currentUser.getTenantId();
int count = checkUnique(sysRole.getName(), tenantId); int count = checkUnique(sysRole.getName(), tenantId);
@@ -112,7 +112,7 @@ public class MallRoleController extends BaseController {
logger.debug("[" + getIpAddr() + "] MallRoleController::add"); logger.debug("[" + getIpAddr() + "] MallRoleController::add");
MallUserInfo currentUser = getUser(); MallUserInfo currentUser = getUser();
if(currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) { if(currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) {
return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有超级管理员才能添加角色");
return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有系统管理员才能添加角色");
} }
Assert.notNull(sysRole.getName(), "角色名不能为空"); Assert.notNull(sysRole.getName(), "角色名不能为空");
Assert.isTrue(checkUnique(sysRole.getName(), currentUser.getTenantId())>0, "重复的角色名"); Assert.isTrue(checkUnique(sysRole.getName(), currentUser.getTenantId())>0, "重复的角色名");
@@ -128,7 +128,7 @@ public class MallRoleController extends BaseController {
logger.debug("[" + getIpAddr() + "] MallRoleController::update"); logger.debug("[" + getIpAddr() + "] MallRoleController::update");
MallUserInfo currentUser = getUser(); MallUserInfo currentUser = getUser();
if(currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) { if(currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) {
return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有超级管理员才能更新角色");
return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有系统管理员才能更新角色");
} }
if (sysRole.getName() != null) { if (sysRole.getName() != null) {
Assert.isTrue(checkUnique(sysRole.getName(), currentUser.getTenantId())>1, "角色名已存在"); Assert.isTrue(checkUnique(sysRole.getName(), currentUser.getTenantId())>1, "角色名已存在");
@@ -146,7 +146,7 @@ public class MallRoleController extends BaseController {
logger.debug("[" + getIpAddr() + "] MallRoleController::delete"); logger.debug("[" + getIpAddr() + "] MallRoleController::delete");
MallUserInfo currentUser = getUser(); MallUserInfo currentUser = getUser();
if(currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) { if(currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) {
return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有超级管理员才能删除角色");
return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有系统管理员才能删除角色");
} }
MallUserRole record = new MallUserRole(); MallUserRole record = new MallUserRole();
record.setRoleId(sysRole.getId()); record.setRoleId(sysRole.getId());


+ 5
- 5
mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java Dosyayı Görüntüle

@@ -119,7 +119,7 @@ public class MallUserInfoController extends BaseController {
logger.debug("[" + getIpAddr() + "] MallUserInfoController::createUser"); logger.debug("[" + getIpAddr() + "] MallUserInfoController::createUser");
MallUserInfo currentUser = getUser(); MallUserInfo currentUser = getUser();
if(currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) { if(currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) {
return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有超级管理员才能添加用户");
return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有系统管理员才能添加用户");
} }


if(checkUniqueName(userInfo.getUsername()) > 0){ if(checkUniqueName(userInfo.getUsername()) > 0){
@@ -155,7 +155,7 @@ public class MallUserInfoController extends BaseController {
// 只有超管和自己能更新信息 // 只有超管和自己能更新信息
if (!(currentUser.getId().equals(userInfo.getId()) || if (!(currentUser.getId().equals(userInfo.getId()) ||
currentUser.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode()))) { currentUser.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode()))) {
return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "超级管理员和自己才能修改信息");
return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "系统管理员和自己才能修改信息");
} }
MallUserInfo oldUser = userInfoService.getById(userInfo.getId()); MallUserInfo oldUser = userInfoService.getById(userInfo.getId());
if (!oldUser.getUsername().equals(userInfo.getUsername())) { if (!oldUser.getUsername().equals(userInfo.getUsername())) {
@@ -175,11 +175,11 @@ public class MallUserInfoController extends BaseController {
PasswordHelper passwordHelper = new PasswordHelper(); PasswordHelper passwordHelper = new PasswordHelper();
passwordHelper.encryptPassword(userInfo); passwordHelper.encryptPassword(userInfo);
} }
// 系统内人员不能设置超级管理员
// 系统内人员不能设置系统管理员
userInfo.setIsAdmin(null); userInfo.setIsAdmin(null);
/* /*
if (!currentUser.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { if (!currentUser.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) {
// 只有超级管理员才能设置超级管理员
// 只有系统管理员才能设置系统管理员
userInfo.setIsAdmin(null); userInfo.setIsAdmin(null);
} }
*/ */
@@ -227,7 +227,7 @@ public class MallUserInfoController extends BaseController {
logger.debug("[" + getIpAddr() + "] MallUserInfoController::deleteUser"); logger.debug("[" + getIpAddr() + "] MallUserInfoController::deleteUser");
MallUserInfo currentUser = getUser(); MallUserInfo currentUser = getUser();
if (currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) { if (currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) {
return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有超级管理员才能删除用户");
return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有系统管理员才能删除用户");
} }
if (currentUser.getId().equals(userInfo.getId())) { if (currentUser.getId().equals(userInfo.getId())) {
return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "用户不能删除自己"); return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "用户不能删除自己");


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java Dosyayı Görüntüle

@@ -380,7 +380,7 @@ public class WechatLoginController extends BaseController {
if(userInfo.getId() == null && userInfo.getUsername() == null) { if(userInfo.getId() == null && userInfo.getUsername() == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
} }
// 只有本人及超级管理员可以解绑微信
// 只有本人及系统管理员可以解绑微信
if(userInfo.getId().equals(user.getId()) if(userInfo.getId().equals(user.getId())
|| user.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { || user.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) {
mallUserInfoService.cleanWebOpenId(userInfo); mallUserInfoService.cleanWebOpenId(userInfo);


+ 1
- 1
mallinkService/src/main/java/com/iformall/common/ErrorCode.java Dosyayı Görüntüle

@@ -359,7 +359,7 @@ public enum ErrorCode{
SHOP_IS_RENT(22001,"商铺已出租"), SHOP_IS_RENT(22001,"商铺已出租"),
SHOP_NOT_SELECTED(22002, "未选择商铺"), SHOP_NOT_SELECTED(22002, "未选择商铺"),
SHOP_BAN_DELETED(22003, "已出租的商铺无法删除"), SHOP_BAN_DELETED(22003, "已出租的商铺无法删除"),
SHOP_DELETED_BY_ADMIN(22004, "仅超级管理员能删除该商铺"),
SHOP_DELETED_BY_ADMIN(22004, "仅系统管理员能删除该商铺"),




/** /**


+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java Dosyayı Görüntüle

@@ -100,9 +100,11 @@ public class WxMerchantSubsidy extends BaseEntity {
private Date updateDate; private Date updateDate;


@Transient @Transient
@io.swagger.annotations.ApiModelProperty(value="开始时间",name="startdate")
private Date startdate; private Date startdate;


@Transient @Transient
@io.swagger.annotations.ApiModelProperty(value="结束时间",name="enddate")
private Date enddate; private Date enddate;


@Transient @Transient


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java Dosyayı Görüntüle

@@ -92,7 +92,7 @@ public class MallPermissionServiceImpl implements MallPermissionService {
@Override @Override
public List<MallPermission> getUserMenuList(MallUserInfo userInfo, Long parentId) { public List<MallPermission> getUserMenuList(MallUserInfo userInfo, Long parentId) {
if(userInfo.isFmSuperAdmin()) { if(userInfo.isFmSuperAdmin()) {
// 富茂超级管理员,返回所有菜单
// 富茂系统管理员,返回所有菜单
return getAllMenuListByParentId(parentId, null); return getAllMenuListByParentId(parentId, null);
} }
else if(userInfo.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { else if(userInfo.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) {


+ 1
- 1
mallinkService/src/main/java/com/iformall/utils/Constant.java Dosyayı Görüntüle

@@ -2,7 +2,7 @@ package com.iformall.utils;


public class Constant { public class Constant {


/** 超级管理员ID */
/** 系统管理员ID */
public static final Long SUPER_ADMIN = 1L; // 富茂超管 public static final Long SUPER_ADMIN = 1L; // 富茂超管
public static final String FM_SYS_ADMIN = "1"; // 富茂管理员 public static final String FM_SYS_ADMIN = "1"; // 富茂管理员




+ 4
- 4
mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java Dosyayı Görüntüle

@@ -84,7 +84,7 @@ public class MallRoleController extends BaseController {
logger.debug("[" + getIpAddr() + "] MallRoleController::saveOrUpdate"); logger.debug("[" + getIpAddr() + "] MallRoleController::saveOrUpdate");
MallUserInfo currentUser = getUser(); MallUserInfo currentUser = getUser();
if(currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) { if(currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) {
return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有超级管理员才能保存角色");
return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有系统管理员才能保存角色");
} }
String tenantId = currentUser.getTenantId(); String tenantId = currentUser.getTenantId();
int count = checkUnique(sysRole.getName(), tenantId); int count = checkUnique(sysRole.getName(), tenantId);
@@ -112,7 +112,7 @@ public class MallRoleController extends BaseController {
logger.debug("[" + getIpAddr() + "] MallRoleController::add"); logger.debug("[" + getIpAddr() + "] MallRoleController::add");
MallUserInfo currentUser = getUser(); MallUserInfo currentUser = getUser();
if(currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) { if(currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) {
return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有超级管理员才能添加角色");
return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有系统管理员才能添加角色");
} }
Assert.notNull(sysRole.getName(), "角色名不能为空"); Assert.notNull(sysRole.getName(), "角色名不能为空");
Assert.isTrue(checkUnique(sysRole.getName(), currentUser.getTenantId())>0, "重复的角色名"); Assert.isTrue(checkUnique(sysRole.getName(), currentUser.getTenantId())>0, "重复的角色名");
@@ -128,7 +128,7 @@ public class MallRoleController extends BaseController {
logger.debug("[" + getIpAddr() + "] MallRoleController::update"); logger.debug("[" + getIpAddr() + "] MallRoleController::update");
MallUserInfo currentUser = getUser(); MallUserInfo currentUser = getUser();
if(currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) { if(currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) {
return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有超级管理员才能更新角色");
return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有系统管理员才能更新角色");
} }
if (sysRole.getName() != null) { if (sysRole.getName() != null) {
Assert.isTrue(checkUnique(sysRole.getName(), currentUser.getTenantId())>1, "角色名已存在"); Assert.isTrue(checkUnique(sysRole.getName(), currentUser.getTenantId())>1, "角色名已存在");
@@ -146,7 +146,7 @@ public class MallRoleController extends BaseController {
logger.debug("[" + getIpAddr() + "] MallRoleController::delete"); logger.debug("[" + getIpAddr() + "] MallRoleController::delete");
MallUserInfo currentUser = getUser(); MallUserInfo currentUser = getUser();
if(currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) { if(currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) {
return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有超级管理员才能删除角色");
return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有系统管理员才能删除角色");
} }
MallUserRole record = new MallUserRole(); MallUserRole record = new MallUserRole();
record.setRoleId(sysRole.getId()); record.setRoleId(sysRole.getId());


+ 5
- 5
mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java Dosyayı Görüntüle

@@ -121,7 +121,7 @@ public class MallUserInfoController extends BaseController {
logger.debug("[" + getIpAddr() + "] MallUserInfoController::createUser"); logger.debug("[" + getIpAddr() + "] MallUserInfoController::createUser");
MallUserInfo currentUser = getUser(); MallUserInfo currentUser = getUser();
if(currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) { if(currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) {
return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有超级管理员才能添加用户");
return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有系统管理员才能添加用户");
} }


if(checkUniqueName(userInfo.getUsername()) > 0){ if(checkUniqueName(userInfo.getUsername()) > 0){
@@ -157,7 +157,7 @@ public class MallUserInfoController extends BaseController {
// 只有超管和自己能更新信息 // 只有超管和自己能更新信息
if (!(currentUser.getId().equals(userInfo.getId()) || if (!(currentUser.getId().equals(userInfo.getId()) ||
currentUser.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode()))) { currentUser.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode()))) {
return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "超级管理员和自己才能修改信息");
return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "系统管理员和自己才能修改信息");
} }
MallUserInfo oldUser = userInfoService.getById(userInfo.getId()); MallUserInfo oldUser = userInfoService.getById(userInfo.getId());
if (!oldUser.getUsername().equals(userInfo.getUsername())) { if (!oldUser.getUsername().equals(userInfo.getUsername())) {
@@ -177,11 +177,11 @@ public class MallUserInfoController extends BaseController {
PasswordHelper passwordHelper = new PasswordHelper(); PasswordHelper passwordHelper = new PasswordHelper();
passwordHelper.encryptPassword(userInfo); passwordHelper.encryptPassword(userInfo);
} }
// 系统内人员不能设置超级管理员
// 系统内人员不能设置系统管理员
userInfo.setIsAdmin(null); userInfo.setIsAdmin(null);
/* /*
if (!currentUser.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { if (!currentUser.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) {
// 只有超级管理员才能设置超级管理员
// 只有系统管理员才能设置系统管理员
userInfo.setIsAdmin(null); userInfo.setIsAdmin(null);
} }
*/ */
@@ -229,7 +229,7 @@ public class MallUserInfoController extends BaseController {
logger.debug("[" + getIpAddr() + "] MallUserInfoController::deleteUser"); logger.debug("[" + getIpAddr() + "] MallUserInfoController::deleteUser");
MallUserInfo currentUser = getUser(); MallUserInfo currentUser = getUser();
if (currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) { if (currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) {
return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有超级管理员才能删除用户");
return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有系统管理员才能删除用户");
} }
if (currentUser.getId().equals(userInfo.getId())) { if (currentUser.getId().equals(userInfo.getId())) {
return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "用户不能删除自己"); return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "用户不能删除自己");


+ 1
- 1
mallinkSysAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java Dosyayı Görüntüle

@@ -380,7 +380,7 @@ public class WechatLoginController extends BaseController {
if(userInfo.getId() == null && userInfo.getUsername() == null) { if(userInfo.getId() == null && userInfo.getUsername() == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
} }
// 只有本人及超级管理员可以解绑微信
// 只有本人及系统管理员可以解绑微信
if(userInfo.getId().equals(user.getId()) if(userInfo.getId().equals(user.getId())
|| user.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { || user.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) {
mallUserInfoService.cleanWebOpenId(userInfo); mallUserInfoService.cleanWebOpenId(userInfo);


Yükleniyor…
İptal
Kaydet