Переглянути джерело

修改角色名称验证逻辑

zhangqiankun 4 роки тому
батько
коміт
ae5fb95bd7

+ 3 - 0
saas-account/src/main/java/com/persagy/account/pojo/dto/SaasProduct.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.persagy.common.annotation.IdGeneratorPrefix;
+import com.persagy.common.constant.SaasCommonConstant;
 import com.persagy.common.model.BaseEntity;
 import com.persagy.common.utils.StringUtil;
 
@@ -28,6 +30,7 @@ import lombok.ToString;
 @ToString
 @EqualsAndHashCode(callSuper = false)
 @TableName("saas_product")
+@IdGeneratorPrefix(SaasCommonConstant.SAAS_PRODUCT_ID_PREFIX)
 public class SaasProduct extends BaseEntity<SaasProduct> {
 	private static final long serialVersionUID = -7374882065014346250L;
 

+ 2 - 2
saas-account/src/main/java/com/persagy/account/service/impl/SaasRoleServiceImpl.java

@@ -52,13 +52,13 @@ public class SaasRoleServiceImpl extends SuperServiceImpl<SaasRoleMapper, SaasRo
 
 	@Override
 	public boolean validRoleName(String groupCode, String roleName, String roleType, String roleId) {
-		LambdaQueryWrapper<SaasRole> queryWrapper = new SaasRole.Builder().createQueryWrapper().idEq(roleId).groupCodeEq(groupCode)
+		LambdaQueryWrapper<SaasRole> queryWrapper = new SaasRole.Builder().createQueryWrapper().groupCodeEq(groupCode)
 				.roleNameEq(roleName).roleTypeEq(roleType).validEq(SaasCommonConstant.STATUS_1).builderQueryWrapper();
 		List<SaasRole> list = this.baseMapper.selectList(queryWrapper);
 		if (CollectionUtil.isEmpty(list)) {
 			return true;
 		}
-		if (list.size() == 1 && StringUtil.isNotBlank(roleId)) {
+		if (StringUtil.isNotBlank(roleId) && list.size() == 1 && roleId.equals(list.get(0).getId())) {
 			return true;
 		}
 		return false;