Merge remote-tracking branch 'origin/master'

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) {

cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysMenuServiceImpl.java

@@ -94,15 +94,15 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> 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<MenuVO> buildMenuTree(List<SysMenu> allMenus) {

cash-service/account-service/src/main/resources/mapper/SysMenuMapper.xml

@@ -13,5 +13,6 @@
         <if test="type != null">
             and c.type=#{type}
         </if>
+        order by menu_sort desc
     </select>
 </mapper>