From aee7e1fa0fec879b8053b0c5d40ab820dc3f2ef2 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 26 Jul 2024 14:21:07 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/shopimpl/TbPlussShopStaffServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPlussShopStaffServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPlussShopStaffServiceImpl.java index 0fb4aecb..7fa1082a 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPlussShopStaffServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPlussShopStaffServiceImpl.java @@ -136,7 +136,11 @@ public class TbPlussShopStaffServiceImpl implements TbPlussShopStaffService { @Override @Transactional(rollbackFor = Exception.class) public void update(TbPlussShopStaff resources) { + if (StringUtils.isBlank(resources.getPassword())) { + resources.setPassword(null); + } TbPlussShopStaff tbPlussShopStaff = tbPlussShopStaffRepository.findById(resources.getId()).orElseGet(TbPlussShopStaff::new); + User sysUser = userRepository.findByUsername(tbPlussShopStaff.getAccount()); resources.setUpdatedAt(Instant.now().toEpochMilli()); ValidationUtil.isNull( tbPlussShopStaff.getId(),"TbPlussShopStaff","id",resources.getId()); tbPlussShopStaff.copy(resources); @@ -145,11 +149,11 @@ public class TbPlussShopStaffServiceImpl implements TbPlussShopStaffService { } tbPlussShopStaffRepository.save(tbPlussShopStaff); //修改 sysUser账号 - User sysUser = userRepository.findByUsername(tbPlussShopStaff.getAccount()); Set roles = new HashSet<>(); Role role = new Role(); role.setId(resources.getRoleId()); roles.add(role); + sysUser.setUsername(resources.getAccount()); sysUser.setRoles(roles); sysUser.setNickName(resources.getName()); if (StringUtils.isNotBlank(resources.getPassword())) { From 0d81d6ea5ad9491e28e3493ea2bde8af2b03016c Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 26 Jul 2024 14:32:39 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=B4=A6=E6=88=B7=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/shopimpl/TbPlussShopStaffServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPlussShopStaffServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPlussShopStaffServiceImpl.java index 7fa1082a..007deca3 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPlussShopStaffServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPlussShopStaffServiceImpl.java @@ -16,6 +16,7 @@ package cn.ysk.cashier.service.impl.shopimpl; import cn.ysk.cashier.exception.BadRequestException; +import cn.ysk.cashier.exception.EntityExistException; import cn.ysk.cashier.pojo.shop.TbPlussShopStaff; import cn.ysk.cashier.system.domain.Dept; import cn.ysk.cashier.system.domain.Job; @@ -129,6 +130,9 @@ public class TbPlussShopStaffServiceImpl implements TbPlussShopStaffService { job.setId(10L); jobs.add(job); user.setJobs(jobs); + if (userRepository.findByUsername(user.getUsername()) != null) { + throw new EntityExistException(User.class, "username", user.getUsername()); + } userRepository.save(user); return tbPlussShopStaffMapper.toDto(tbPlussShopStaffRepository.save(resources)); } From e592d5503da13a9b51f2f360c713df257a0dcce4 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 26 Jul 2024 14:36:15 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=91=98=E5=B7=A5=E8=B4=A6=E6=88=B7?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/shopimpl/TbPlussShopStaffServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPlussShopStaffServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPlussShopStaffServiceImpl.java index 007deca3..66035b40 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPlussShopStaffServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPlussShopStaffServiceImpl.java @@ -131,7 +131,7 @@ public class TbPlussShopStaffServiceImpl implements TbPlussShopStaffService { jobs.add(job); user.setJobs(jobs); if (userRepository.findByUsername(user.getUsername()) != null) { - throw new EntityExistException(User.class, "username", user.getUsername()); + throw new BadRequestException("员工账号已存在"); } userRepository.save(user); return tbPlussShopStaffMapper.toDto(tbPlussShopStaffRepository.save(resources)); From 5dff4105e646a1f01f1ed97fbb441bb50fef849c Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 26 Jul 2024 15:32:24 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=20=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E8=B4=A6=E6=88=B7=E4=B8=8D=E5=8F=AF=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/shopimpl/TbPlussShopStaffServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPlussShopStaffServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPlussShopStaffServiceImpl.java index 66035b40..38880845 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPlussShopStaffServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPlussShopStaffServiceImpl.java @@ -145,6 +145,11 @@ public class TbPlussShopStaffServiceImpl implements TbPlussShopStaffService { } TbPlussShopStaff tbPlussShopStaff = tbPlussShopStaffRepository.findById(resources.getId()).orElseGet(TbPlussShopStaff::new); User sysUser = userRepository.findByUsername(tbPlussShopStaff.getAccount()); + if(tbPlussShopStaff.getAccount().equals(resources.getAccount())){ + if (userRepository.findByUsername(resources.getAccount()) != null) { + throw new BadRequestException("员工账号不可重复"); + } + } resources.setUpdatedAt(Instant.now().toEpochMilli()); ValidationUtil.isNull( tbPlussShopStaff.getId(),"TbPlussShopStaff","id",resources.getId()); tbPlussShopStaff.copy(resources); From 80e666126c49ce528101a93e44082335dda58f21 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 26 Jul 2024 15:35:51 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=20=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E8=B4=A6=E6=88=B7=E4=B8=8D=E5=8F=AF=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/shopimpl/TbPlussShopStaffServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPlussShopStaffServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPlussShopStaffServiceImpl.java index 38880845..9a702986 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPlussShopStaffServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPlussShopStaffServiceImpl.java @@ -145,7 +145,7 @@ public class TbPlussShopStaffServiceImpl implements TbPlussShopStaffService { } TbPlussShopStaff tbPlussShopStaff = tbPlussShopStaffRepository.findById(resources.getId()).orElseGet(TbPlussShopStaff::new); User sysUser = userRepository.findByUsername(tbPlussShopStaff.getAccount()); - if(tbPlussShopStaff.getAccount().equals(resources.getAccount())){ + if(!tbPlussShopStaff.getAccount().equals(resources.getAccount())){ if (userRepository.findByUsername(resources.getAccount()) != null) { throw new BadRequestException("员工账号不可重复"); } From 92e743cb8f66c15c34bce0a7c2eda54d1f889204 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 26 Jul 2024 16:47:01 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=95=86=E5=AE=B6=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E8=B4=A6=E5=8F=B7=20=E9=BB=98=E8=AE=A4=E4=B8=BA?= =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=90=8D=E7=A7=B0=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=97=B6=20=E8=AF=A5=E5=BA=97=E9=93=BA=E7=9A=84=20Master?= =?UTF-8?q?=E5=91=98=E5=B7=A5=20=E5=90=8D=E7=A7=B0=E4=B8=80=E5=BE=8B?= =?UTF-8?q?=E4=B8=BA=E5=BA=97=E9=93=BA=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashier/repository/shop/TbPlussShopStaffRepository.java | 6 ++++++ .../service/impl/shopimpl/TbShopInfoServiceImpl.java | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbPlussShopStaffRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbPlussShopStaffRepository.java index 8675952b..b7d4a6a5 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbPlussShopStaffRepository.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbPlussShopStaffRepository.java @@ -21,6 +21,8 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; +import java.util.List; + /** * @website https://eladmin.vip * @author lyf @@ -42,4 +44,8 @@ public interface TbPlussShopStaffRepository extends JpaRepository