submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -2595,6 +2595,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
 
     //完单校验
     private void validFinish(TopFinishOrderBo bo) {
+        if ("admin".equals(bo.getLoginName())){
+            return;
+        }
         //校验当前角色审核权限
         List<TopSysUserRole> userRoleList = topSysUserRoleService.list(new LambdaQueryWrapper<TopSysUserRole>().eq(TopSysUserRole::getUserId, bo.getLoginId()));
         if (CollectionUtils.isEmpty(userRoleList) && !bo.getLoginName().equals("admin")) {
@@ -2607,8 +2610,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                         .eq(TopOldOrderCheck::getStatus, 1)
                         .last("limit 1"));
 
-        if (!"admin".equals(bo.getLoginName()) || ObjectUtil.isNull(orderCheck) ||
-                (roleIds.stream().noneMatch(x -> x.equals(orderCheck.getCheckRole())))) {
+        if (ObjectUtil.isNull(orderCheck) || (roleIds.stream().noneMatch(x -> x.equals(orderCheck.getCheckRole())))) {
             throw new CustomException("当前账号没有审核权限");
         }
     }