diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/AdminServiceImpl.java b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/AdminServiceImpl.java index 88a4f2eac..298646b52 100644 --- a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/AdminServiceImpl.java +++ b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/AdminServiceImpl.java @@ -183,7 +183,7 @@ public class AdminServiceImpl implements AdminService { } // TODO 芋艿,这里先简单实现。即方式是,删除老的分配的角色关系,然后添加新的分配的角色关系 // 标记管理员角色源关系都为删除 - adminRoleMapper.updateToDeletedByRoleId(updateAdminId); + adminRoleMapper.updateToDeletedByAdminId(updateAdminId); // 创建 RoleResourceDO 数组,并插入到数据库 if (!roleIds.isEmpty()) { List adminRoleDOs = roleIds.stream().map(roleId -> { diff --git a/admin/admin-service-impl/src/main/resources/mapper/AdminRoleMapper.xml b/admin/admin-service-impl/src/main/resources/mapper/AdminRoleMapper.xml index f677b8a50..8faa8f3af 100644 --- a/admin/admin-service-impl/src/main/resources/mapper/AdminRoleMapper.xml +++ b/admin/admin-service-impl/src/main/resources/mapper/AdminRoleMapper.xml @@ -16,6 +16,7 @@ FROM admin a, admin_role ar WHERE a.id = #{adminId} AND a.id = ar.admin_id + AND ar.deleted = 0 diff --git a/admin/admin-service-impl/src/main/resources/mapper/RoleMapper.xml b/admin/admin-service-impl/src/main/resources/mapper/RoleMapper.xml index 329c960bc..8b1b84b7f 100644 --- a/admin/admin-service-impl/src/main/resources/mapper/RoleMapper.xml +++ b/admin/admin-service-impl/src/main/resources/mapper/RoleMapper.xml @@ -63,7 +63,7 @@ + SELECT + + FROM app + WHERE id = #{id} + + + \ No newline at end of file diff --git a/publish_admin.sh b/publish_admin.sh deleted file mode 100644 index a9a2ca64c..000000000 --- a/publish_admin.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash -sh build_admin.sh -scp admin/admin-application/target/admin-application-1.0-SNAPSHOT.jar runner@192.168.88.10:/work2/project/admin \ No newline at end of file