From 96bfc976752848ee6683cb9e104d6ed34c4dd336 Mon Sep 17 00:00:00 2001 From: yijiegong Date: Mon, 23 Sep 2024 10:10:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=91=98=E5=B7=A5?= =?UTF-8?q?=E6=9D=83=E9=99=90=20=E5=91=98=E5=B7=A5=E6=9D=83=E9=99=90bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TbShopStaffPermissionServiceImpl.java | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbShopStaffPermissionServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbShopStaffPermissionServiceImpl.java index 3d6904a5..d5e6542b 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbShopStaffPermissionServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbShopStaffPermissionServiceImpl.java @@ -77,24 +77,28 @@ public class TbShopStaffPermissionServiceImpl extends ServiceImpl staffPermissions = new ArrayList<>(); for (TbShopPermissionDto permission : permissionIds) { - TbShopStaffPermission staffPermission = new TbShopStaffPermission(); - staffPermission.setUserId(userId); - staffPermission.setPermissionId(permission.getId()); - staffPermission.setStaffId(staffId); - staffPermission.setShopId(shopId); - staffPermissions.add(staffPermission); + if (permission.getHasPermission().equals(1)) { + TbShopStaffPermission staffPermission = new TbShopStaffPermission(); + staffPermission.setUserId(userId); + staffPermission.setPermissionId(permission.getId()); + staffPermission.setStaffId(staffId); + staffPermission.setShopId(shopId); + staffPermissions.add(staffPermission); + } if (permission.getChildren().isEmpty()) { continue; } for (TbShopPermissionDto child : permission.getChildren()) { - TbShopStaffPermission childStaffPermission = new TbShopStaffPermission(); - childStaffPermission.setUserId(userId); - childStaffPermission.setPermissionId(child.getId()); - staffPermission.setStaffId(staffId); - staffPermission.setShopId(shopId); - staffPermissions.add(childStaffPermission); + if (child.getHasPermission().equals(1)) { + TbShopStaffPermission childStaffPermission = new TbShopStaffPermission(); + childStaffPermission.setUserId(userId); + childStaffPermission.setPermissionId(child.getId()); + childStaffPermission.setStaffId(staffId); + childStaffPermission.setShopId(shopId); + staffPermissions.add(childStaffPermission); + } } } From a3c9deda2989867e1cab7a8351d65e1659950a79 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 23 Sep 2024 09:48:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=91=98=E5=B7=A5=20=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E7=B1=BB=20=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ysk/cashier/{ => mybatis}/entity/TbShopPermission.java | 4 +--- .../cashier/{ => mybatis}/entity/TbShopStaffPermission.java | 4 +--- .../ysk/cashier/mybatis/mapper/TbShopPermissionMapper.java | 2 +- .../cashier/mybatis/mapper/TbShopStaffPermissionMapper.java | 2 +- .../cn/ysk/cashier/service/TbShopPermissionService.java | 2 +- .../ysk/cashier/service/TbShopStaffPermissionService.java | 3 +-- .../cashier/service/impl/TbShopPermissionServiceImpl.java | 2 +- .../service/impl/TbShopStaffPermissionServiceImpl.java | 6 ++---- 8 files changed, 9 insertions(+), 16 deletions(-) rename eladmin-system/src/main/java/cn/ysk/cashier/{ => mybatis}/entity/TbShopPermission.java (97%) rename eladmin-system/src/main/java/cn/ysk/cashier/{ => mybatis}/entity/TbShopStaffPermission.java (95%) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/entity/TbShopPermission.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbShopPermission.java similarity index 97% rename from eladmin-system/src/main/java/cn/ysk/cashier/entity/TbShopPermission.java rename to eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbShopPermission.java index 56969adc..5de08bf7 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/entity/TbShopPermission.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbShopPermission.java @@ -1,11 +1,9 @@ -package cn.ysk.cashier.entity; +package cn.ysk.cashier.mybatis.entity; import java.util.Date; import com.baomidou.mybatisplus.extension.activerecord.Model; -import java.io.Serializable; - /** * (TbShopPermission)表实体类 * diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/entity/TbShopStaffPermission.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbShopStaffPermission.java similarity index 95% rename from eladmin-system/src/main/java/cn/ysk/cashier/entity/TbShopStaffPermission.java rename to eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbShopStaffPermission.java index ce294d6e..0e31b83c 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/entity/TbShopStaffPermission.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbShopStaffPermission.java @@ -1,9 +1,7 @@ -package cn.ysk.cashier.entity; +package cn.ysk.cashier.mybatis.entity; import com.baomidou.mybatisplus.extension.activerecord.Model; -import java.io.Serializable; - /** * 店铺员工权限关联表(TbShopStaffPermission)表实体类 * diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbShopPermissionMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbShopPermissionMapper.java index 07dec7b0..e99b1533 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbShopPermissionMapper.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbShopPermissionMapper.java @@ -1,7 +1,7 @@ package cn.ysk.cashier.mybatis.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import cn.ysk.cashier.entity.TbShopPermission; +import cn.ysk.cashier.mybatis.entity.TbShopPermission; /** * (TbShopPermission)表数据库访问层 diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbShopStaffPermissionMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbShopStaffPermissionMapper.java index 2450e007..3b2e48d8 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbShopStaffPermissionMapper.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbShopStaffPermissionMapper.java @@ -1,7 +1,7 @@ package cn.ysk.cashier.mybatis.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import cn.ysk.cashier.entity.TbShopStaffPermission; +import cn.ysk.cashier.mybatis.entity.TbShopStaffPermission; /** * 店铺员工权限关联表(TbShopStaffPermission)表数据库访问层 diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/TbShopPermissionService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/TbShopPermissionService.java index b49ef368..b85bfd98 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/TbShopPermissionService.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/TbShopPermissionService.java @@ -2,7 +2,7 @@ package cn.ysk.cashier.service; import cn.ysk.cashier.dto.shop.TbShopPermissionDto; import com.baomidou.mybatisplus.extension.service.IService; -import cn.ysk.cashier.entity.TbShopPermission; +import cn.ysk.cashier.mybatis.entity.TbShopPermission; import org.springframework.http.ResponseEntity; import java.util.List; diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/TbShopStaffPermissionService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/TbShopStaffPermissionService.java index 04d88587..9dc05c74 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/TbShopStaffPermissionService.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/TbShopStaffPermissionService.java @@ -1,9 +1,8 @@ package cn.ysk.cashier.service; import cn.ysk.cashier.dto.shop.TbShopPermissionDto; -import cn.ysk.cashier.mybatis.mapper.TbShopStaffPermissionMapper; import com.baomidou.mybatisplus.extension.service.IService; -import cn.ysk.cashier.entity.TbShopStaffPermission; +import cn.ysk.cashier.mybatis.entity.TbShopStaffPermission; import java.util.List; diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbShopPermissionServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbShopPermissionServiceImpl.java index 2a31b586..acd9e811 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbShopPermissionServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbShopPermissionServiceImpl.java @@ -6,7 +6,7 @@ import cn.ysk.cashier.utils.StringUtils; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import cn.ysk.cashier.entity.TbShopPermission; +import cn.ysk.cashier.mybatis.entity.TbShopPermission; import cn.ysk.cashier.service.TbShopPermissionService; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbShopStaffPermissionServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbShopStaffPermissionServiceImpl.java index d5e6542b..9aee7505 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbShopStaffPermissionServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbShopStaffPermissionServiceImpl.java @@ -1,20 +1,18 @@ package cn.ysk.cashier.service.impl; import cn.ysk.cashier.dto.shop.TbShopPermissionDto; -import cn.ysk.cashier.entity.TbShopPermission; +import cn.ysk.cashier.mybatis.entity.TbShopPermission; import cn.ysk.cashier.service.TbShopPermissionService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.ysk.cashier.mybatis.mapper.TbShopStaffPermissionMapper; -import cn.ysk.cashier.entity.TbShopStaffPermission; +import cn.ysk.cashier.mybatis.entity.TbShopStaffPermission; import cn.ysk.cashier.service.TbShopStaffPermissionService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import javax.transaction.Transactional; import java.util.ArrayList; -import java.util.Collections; import java.util.List; /** From 1e54eb14565dd6d9830330de5398ade6c62c49fd Mon Sep 17 00:00:00 2001 From: yijiegong Date: Mon, 23 Sep 2024 11:00:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?hasPermission=20=E5=A2=9E=E5=8A=A0=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/ysk/cashier/dto/shop/TbShopPermissionDto.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopPermissionDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopPermissionDto.java index 07d6874f..74bd00f5 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopPermissionDto.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopPermissionDto.java @@ -25,4 +25,11 @@ public class TbShopPermissionDto { private Integer hasPermission; private List children; + + public Integer getHasPermission() { + if (hasPermission == null) { + return 0; + } + return hasPermission; + } }