From 472f65adfcd098cc0a290d1fbda893de58109a9d Mon Sep 17 00:00:00 2001 From: TanJ Date: Wed, 13 Sep 2023 18:00:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8C=87=E5=88=A0=E9=99=A4role=20user?= =?UTF-8?q?=20=E6=8A=A5=E9=94=99=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 同时添加了启动参数 --- README.md | 12 +++++++++++- .../repository/service/SaasRoleUserRelationDao.java | 8 ++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 23c731de..a25a1b85 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,14 @@ # 项目介绍 提尔（Týr），是北欧神话中的战争与勇气之神，同时也是契约的保证人，誓言的守护者和荣耀的代表。阿萨神族主神奥丁之子。 -权限服务 \ No newline at end of file +权限服务 + + +dev环境启动参数： +-Dspring.datasource.url=jdbc:mysql://116.63.13.181:3311/pudge-dev?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=true&verifyServerCertificate=false&rewriteBatchedStatements=true +-Dspring.redis.host=123.249.44.111 +-Drocketmq.name-server=114.116.202.128:9876 +-Dspring.redis.port=31270 +-DCUSTOM_ENV=dev +-Dserver.port=8080 +-Dspring.profiles.active=dev \ No newline at end of file diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasRoleUserRelationDao.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasRoleUserRelationDao.java index e0536a7d..91674d48 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasRoleUserRelationDao.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasRoleUserRelationDao.java @@ -7,7 +7,11 @@ import cn.axzo.tyr.client.model.roleuser.req.RoleUserReq; import cn.axzo.tyr.server.repository.entity.SaasRoleUserRelation; import cn.axzo.tyr.server.repository.mapper.SaasRoleUserRelationMapper; import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.extension.toolkit.ChainWrappers; import org.springframework.stereotype.Repository; import java.util.List; @@ -39,12 +43,12 @@ public class SaasRoleUserRelationDao extends ServiceImpl roleId) { remove( - lambdaQuery() + Wrappers.lambdaQuery(SaasRoleUserRelation.class) .eq(SaasRoleUserRelation::getIdentityId, baseWorkspaceModel.getIdentityId()) .eq(SaasRoleUserRelation::getIdentityType, baseWorkspaceModel.getIdentityType()) .eq(SaasRoleUserRelation::getWorkspaceId, baseWorkspaceModel.getWorkspaceId()) .eq(SaasRoleUserRelation::getOuId, baseWorkspaceModel.getOuId()) - .eq(CollectionUtil.isNotEmpty(roleId), SaasRoleUserRelation::getRoleId, roleId) + .in(CollectionUtil.isNotEmpty(roleId), SaasRoleUserRelation::getRoleId, roleId) ); }