From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 16 十月 2023 09:03:47 +0800 Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3 --- server/src/main/java/doumeemes/service/system/impl/SystemRolePermissionServiceImpl.java | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/server/src/main/java/doumeemes/service/system/impl/SystemRolePermissionServiceImpl.java b/server/src/main/java/doumeemes/service/system/impl/SystemRolePermissionServiceImpl.java index 6ae91f3..ed51da0 100644 --- a/server/src/main/java/doumeemes/service/system/impl/SystemRolePermissionServiceImpl.java +++ b/server/src/main/java/doumeemes/service/system/impl/SystemRolePermissionServiceImpl.java @@ -43,15 +43,21 @@ this.updateById(systemRolePermission); } - @Override + /* @Override public void delete(SystemRolePermission systemRolePermission) { SystemRolePermission newPermission = new SystemRolePermission(); newPermission.setDeleted(Boolean.TRUE); UpdateWrapper<SystemRolePermission> updateWrapper = new UpdateWrapper<>(systemRolePermission); - /* if(systemRolePermission.getCompanyId()!=null){ + *//* if(systemRolePermission.getCompanyId()!=null){ updateWrapper.exists("select system_role.id from system_role where system_role.id=system_role_permission.`ROLE_ID` and system_role.`COMPANY_ID`="+systemRolePermission.getCompanyId()); - }*/ + }*//* systemRolePermissionMapper.update(newPermission, updateWrapper); + }*/ + @Override + public void delete(SystemRolePermission systemRolePermission) { + SystemRolePermission newPermission = new SystemRolePermission(); + newPermission.setRoleId(systemRolePermission.getRoleId()); + systemRolePermissionMapper.delete(new QueryWrapper<>(newPermission)); } @Override -- Gitblit v1.9.3