From 781299b0275705b386fd0808fe7cd457cd43c292 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
<8605635+zhang3064194730@user.noreply.gitee.com>
Date: Tue, 11 Mar 2025 10:13:04 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../account/service/impl/AuthorizationServiceImpl.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java
index dd2ec06e5..f3e79bafd 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java
@@ -77,7 +77,10 @@ public class AuthorizationServiceImpl implements AuthorizationService {
SysUser user;
// 员工账号登录
- if (StrUtil.isNotBlank(loginDTO.staffUserName())) {
+ if (loginDTO.loginType() == 1) {
+ if (StrUtil.isBlank(loginDTO.staffUserName())) {
+ throw new ApiNotPrintException("员工账号不能为空");
+ }
// 查询主账号
SysUser sysUser = sysUserService.queryChain().eq(SysUser::getAccount, loginDTO.username()).one();
if (sysUser == null) {
From c2e1afa8d8c07b6ac3796af7ae8a6f00f175679e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
<8605635+zhang3064194730@user.noreply.gitee.com>
Date: Tue, 11 Mar 2025 10:19:10 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../account-service/src/main/resources/mapper/SysMenuMapper.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/cash-service/account-service/src/main/resources/mapper/SysMenuMapper.xml b/cash-service/account-service/src/main/resources/mapper/SysMenuMapper.xml
index fbfe861f1..ccfccfa7b 100644
--- a/cash-service/account-service/src/main/resources/mapper/SysMenuMapper.xml
+++ b/cash-service/account-service/src/main/resources/mapper/SysMenuMapper.xml
@@ -13,5 +13,6 @@
and c.type=#{type}
+ order by menu_sort desc
From 60abe03bfb0e5c3b50b0f35849f190554012de3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
<8605635+zhang3064194730@user.noreply.gitee.com>
Date: Tue, 11 Mar 2025 10:23:57 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E8=8F=9C=E5=8D=95?=
=?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/SysMenuServiceImpl.java | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysMenuServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysMenuServiceImpl.java
index c3d2b7fe2..fdece39a8 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysMenuServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysMenuServiceImpl.java
@@ -94,15 +94,15 @@ public class SysMenuServiceImpl extends ServiceImpl impl
private void checkExIsis(String title, Integer id) {
- QueryWrapper queryWrapper = new QueryWrapper();
- if (id != null) {
- queryWrapper.ne(SysMenu::getMenuId, id);
- }
- queryWrapper.eq(SysMenu::getTitle, title);
- long count = count(queryWrapper);
- if (count > 0) {
- throw new ApiNotPrintException("名称已存在");
- }
+// QueryWrapper queryWrapper = new QueryWrapper();
+// if (id != null) {
+// queryWrapper.ne(SysMenu::getMenuId, id);
+// }
+// queryWrapper.eq(SysMenu::getTitle, title);
+// long count = count(queryWrapper);
+// if (count > 0) {
+// throw new ApiNotPrintException("名称已存在");
+// }
}
private List buildMenuTree(List allMenus) {