From 19fe6936cbe4deef1f18186350a71acff4dff58e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 14 一月 2025 17:06:18 +0800
Subject: [PATCH] # 24. PDA出库成功后,界面数据重置,避免重复操作  (已修复) 25. PDA接口请求,添加一个Loading遮档  (已修复) 27. 非平库单据,在平库可做入库操作  (已修复) 29. 平库入库后,订单明细没有添加(已修复) 30. 平库入库后,单据类型没有修改(已修复) 31. 没有绑定播种位,不能进行播种,前后端都需加判定(已修复) 33. 平库入库未修改入库已完成数量(已修复)

---
 zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/RoleResourceMapper.java |   40 ++++++++++++++++++++--------------------
 1 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/RoleResourceMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/RoleResourceMapper.java
index c85a382..887d972 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/RoleResourceMapper.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/RoleResourceMapper.java
@@ -1,20 +1,20 @@
-package com.zy.asrs.common.sys.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zy.asrs.common.sys.entity.Resource;
-import com.zy.asrs.common.sys.entity.RoleResource;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Mapper
-@Repository
-public interface RoleResourceMapper extends BaseMapper<RoleResource> {
-
-    @Select("select sr.* from sys_resource sr left join sys_role_resource srr on srr.resource_id = sr.id left join sys_user su on su.role_id = srr.role_id where 1 = 1 and su.id = #{userId} and sr. level = 3 and sr.resource_id = #{fatherResourceId} and sr. status = 1 order by sr.sort")
-    List<Resource> getMenuButtomResource(@Param("fatherResourceId") Long fatherResourceId, @Param("userId") Long userId);
-
-}
+package com.zy.asrs.common.sys.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zy.asrs.common.sys.entity.Resource;
+import com.zy.asrs.common.sys.entity.RoleResource;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Mapper
+@Repository
+public interface RoleResourceMapper extends BaseMapper<RoleResource> {
+
+    @Select("select sr.* from sys_resource sr left join sys_role_resource srr on srr.resource_id = sr.id left join sys_user su on su.role_id = srr.role_id where 1 = 1 and su.id = #{userId} and sr. level = 3 and sr.resource_id = #{fatherResourceId} and sr. status = 1 order by sr.sort")
+    List<Resource> getMenuButtomResource(@Param("fatherResourceId") Long fatherResourceId, @Param("userId") Long userId);
+
+}

--
Gitblit v1.9.1