diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java index 3a432cc4e..6f79ce957 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java @@ -84,7 +84,7 @@ public class MallRoleController extends BaseController { logger.debug("[" + getIpAddr() + "] MallRoleController::saveOrUpdate"); MallUserInfo currentUser = getUser(); 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(); int count = checkUnique(sysRole.getName(), tenantId); @@ -112,7 +112,7 @@ public class MallRoleController extends BaseController { logger.debug("[" + getIpAddr() + "] MallRoleController::add"); MallUserInfo currentUser = getUser(); 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.isTrue(checkUnique(sysRole.getName(), currentUser.getTenantId())>0, "重复的角色名"); @@ -128,7 +128,7 @@ public class MallRoleController extends BaseController { logger.debug("[" + getIpAddr() + "] MallRoleController::update"); MallUserInfo currentUser = getUser(); 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) { Assert.isTrue(checkUnique(sysRole.getName(), currentUser.getTenantId())>1, "角色名已存在"); @@ -146,7 +146,7 @@ public class MallRoleController extends BaseController { logger.debug("[" + getIpAddr() + "] MallRoleController::delete"); MallUserInfo currentUser = getUser(); 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(); record.setRoleId(sysRole.getId()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java index f732aa69d..ffd0a3aaa 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java @@ -119,7 +119,7 @@ public class MallUserInfoController extends BaseController { logger.debug("[" + getIpAddr() + "] MallUserInfoController::createUser"); MallUserInfo currentUser = getUser(); 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){ @@ -155,7 +155,7 @@ public class MallUserInfoController extends BaseController { // 只有超管和自己能更新信息 if (!(currentUser.getId().equals(userInfo.getId()) || 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()); if (!oldUser.getUsername().equals(userInfo.getUsername())) { @@ -175,11 +175,11 @@ public class MallUserInfoController extends BaseController { PasswordHelper passwordHelper = new PasswordHelper(); passwordHelper.encryptPassword(userInfo); } - // 系统内人员不能设置超级管理员 + // 系统内人员不能设置系统管理员 userInfo.setIsAdmin(null); /* if (!currentUser.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { - // 只有超级管理员才能设置超级管理员 + // 只有系统管理员才能设置系统管理员 userInfo.setIsAdmin(null); } */ @@ -227,7 +227,7 @@ public class MallUserInfoController extends BaseController { logger.debug("[" + getIpAddr() + "] MallUserInfoController::deleteUser"); MallUserInfo currentUser = getUser(); 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())) { return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "用户不能删除自己"); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java index 08a48846a..6ab138a15 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java @@ -380,7 +380,7 @@ public class WechatLoginController extends BaseController { if(userInfo.getId() == null && userInfo.getUsername() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - // 只有本人及超级管理员可以解绑微信 + // 只有本人及系统管理员可以解绑微信 if(userInfo.getId().equals(user.getId()) || user.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { mallUserInfoService.cleanWebOpenId(userInfo); diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 3cd142561..5431148b5 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -359,7 +359,7 @@ public enum ErrorCode{ SHOP_IS_RENT(22001,"商铺已出租"), SHOP_NOT_SELECTED(22002, "未选择商铺"), SHOP_BAN_DELETED(22003, "已出租的商铺无法删除"), - SHOP_DELETED_BY_ADMIN(22004, "仅超级管理员能删除该商铺"), + SHOP_DELETED_BY_ADMIN(22004, "仅系统管理员能删除该商铺"), /** diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java index 42441554c..0b1ff4a1c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java @@ -100,9 +100,11 @@ public class WxMerchantSubsidy extends BaseEntity { private Date updateDate; @Transient + @io.swagger.annotations.ApiModelProperty(value="开始时间",name="startdate") private Date startdate; @Transient + @io.swagger.annotations.ApiModelProperty(value="结束时间",name="enddate") private Date enddate; @Transient diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java index ba2d377f9..e2673d807 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java @@ -92,7 +92,7 @@ public class MallPermissionServiceImpl implements MallPermissionService { @Override public List getUserMenuList(MallUserInfo userInfo, Long parentId) { if(userInfo.isFmSuperAdmin()) { - // 富茂超级管理员,返回所有菜单 + // 富茂系统管理员,返回所有菜单 return getAllMenuListByParentId(parentId, null); } else if(userInfo.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { diff --git a/mallinkService/src/main/java/com/iformall/utils/Constant.java b/mallinkService/src/main/java/com/iformall/utils/Constant.java index d1794e2f3..ae83b7a52 100644 --- a/mallinkService/src/main/java/com/iformall/utils/Constant.java +++ b/mallinkService/src/main/java/com/iformall/utils/Constant.java @@ -2,7 +2,7 @@ package com.iformall.utils; public class Constant { - /** 超级管理员ID */ + /** 系统管理员ID */ public static final Long SUPER_ADMIN = 1L; // 富茂超管 public static final String FM_SYS_ADMIN = "1"; // 富茂管理员 diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java index 3a432cc4e..6f79ce957 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java @@ -84,7 +84,7 @@ public class MallRoleController extends BaseController { logger.debug("[" + getIpAddr() + "] MallRoleController::saveOrUpdate"); MallUserInfo currentUser = getUser(); 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(); int count = checkUnique(sysRole.getName(), tenantId); @@ -112,7 +112,7 @@ public class MallRoleController extends BaseController { logger.debug("[" + getIpAddr() + "] MallRoleController::add"); MallUserInfo currentUser = getUser(); 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.isTrue(checkUnique(sysRole.getName(), currentUser.getTenantId())>0, "重复的角色名"); @@ -128,7 +128,7 @@ public class MallRoleController extends BaseController { logger.debug("[" + getIpAddr() + "] MallRoleController::update"); MallUserInfo currentUser = getUser(); 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) { Assert.isTrue(checkUnique(sysRole.getName(), currentUser.getTenantId())>1, "角色名已存在"); @@ -146,7 +146,7 @@ public class MallRoleController extends BaseController { logger.debug("[" + getIpAddr() + "] MallRoleController::delete"); MallUserInfo currentUser = getUser(); 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(); record.setRoleId(sysRole.getId()); diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java index b67fa5f53..d2251bf36 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java @@ -121,7 +121,7 @@ public class MallUserInfoController extends BaseController { logger.debug("[" + getIpAddr() + "] MallUserInfoController::createUser"); MallUserInfo currentUser = getUser(); 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){ @@ -157,7 +157,7 @@ public class MallUserInfoController extends BaseController { // 只有超管和自己能更新信息 if (!(currentUser.getId().equals(userInfo.getId()) || 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()); if (!oldUser.getUsername().equals(userInfo.getUsername())) { @@ -177,11 +177,11 @@ public class MallUserInfoController extends BaseController { PasswordHelper passwordHelper = new PasswordHelper(); passwordHelper.encryptPassword(userInfo); } - // 系统内人员不能设置超级管理员 + // 系统内人员不能设置系统管理员 userInfo.setIsAdmin(null); /* if (!currentUser.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { - // 只有超级管理员才能设置超级管理员 + // 只有系统管理员才能设置系统管理员 userInfo.setIsAdmin(null); } */ @@ -229,7 +229,7 @@ public class MallUserInfoController extends BaseController { logger.debug("[" + getIpAddr() + "] MallUserInfoController::deleteUser"); MallUserInfo currentUser = getUser(); 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())) { return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "用户不能删除自己"); diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java index 08a48846a..6ab138a15 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java @@ -380,7 +380,7 @@ public class WechatLoginController extends BaseController { if(userInfo.getId() == null && userInfo.getUsername() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - // 只有本人及超级管理员可以解绑微信 + // 只有本人及系统管理员可以解绑微信 if(userInfo.getId().equals(user.getId()) || user.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { mallUserInfoService.cleanWebOpenId(userInfo);