From 1784251cf3fab375684a1d2f15f50a7ba5827889 Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Thu, 11 Apr 2024 10:40:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/WarehouseKeeperMapper.java    | 30 +++++++++++++++++++
 .../base/service/WarehouseKeeperService.java  | 20 +++++++++++++
 .../mapper/base/WarehouseKeeperMapper.xml     | 10 ++-----
 3 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/WarehouseKeeperMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/WarehouseKeeperMapper.java
index dcdf4f8e..e8bd4a7f 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/WarehouseKeeperMapper.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/WarehouseKeeperMapper.java
@@ -11,13 +11,43 @@ import java.util.List;
  */
 @Mapper
 public interface WarehouseKeeperMapper {
+    /**
+     * 查询库管员配置列表
+     *
+     * @param bean
+     * @return
+     */
     List<WarehouseKeeper> getWarehouseKeeperInfoAll(WarehouseKeeper bean);
 
+    /**
+     * 根据人员名称查询左侧列表
+     *
+     * @param userName
+     * @return
+     */
     List<WarehouseKeeper> getMaUserList(String userName);
 
+    /**
+     * 保存
+     *
+     * @param list
+     * @return
+     */
     int add(List<WarehouseKeeper> list);
 
+    /**
+     * 删除
+     *
+     * @param typeId
+     * @return
+     */
     int deleteByIds(String typeId);
 
+    /**
+     * 批量删除
+     *
+     * @param typeIds
+     * @return
+     */
     int deleteByIdsAll(String[] typeIds);
 }
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/WarehouseKeeperService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/WarehouseKeeperService.java
index 65dea857..f6230ace 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/WarehouseKeeperService.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/WarehouseKeeperService.java
@@ -8,11 +8,31 @@ import java.util.List;
  * @author lsun
  */
 public interface WarehouseKeeperService {
+    /**
+    * 获取库管员配置列表
+    * @param  bean
+    * @return  List<WarehouseKeeper>
+    */
     List<WarehouseKeeper> getWarehouseKeeperInfoAll(WarehouseKeeper bean);
 
+    /**
+    * 根据人员名称查询左侧列表
+    * @param  userName
+    * @return  List<WarehouseKeeper>
+    */
     List<WarehouseKeeper> getMaUserList (String userName);
 
+    /**
+    * 保存
+    * @param  bean
+    * @return  int
+    */
     int add(WarehouseKeeper bean);
 
+    /**
+    * 删除库管员配置
+    * @param  bean
+    * @return  int
+    */
     int deleteByIds(WarehouseKeeper bean);
 }
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/WarehouseKeeperMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/WarehouseKeeperMapper.xml
index 48bf95b9..8f20a4b1 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/WarehouseKeeperMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/WarehouseKeeperMapper.xml
@@ -23,10 +23,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getWarehouseKeeperInfoAll" resultType="com.bonus.sgzb.base.domain.WarehouseKeeper">
         SELECT mt.type_id as modelId ,mt.type_name as modelName,
-               mt2.type_id, mt2.type_name  as typeName,
-               mt3.type_id as typeId,
-               mt3.type_id as kindId,mt4.type_name as kindName,
-               su.user_id as userId, su.nick_name as userName
+        mt2.type_name  as typeName,
+        mt4.type_name as kindName,
+        su.user_id as userId, su.nick_name as userName
         FROM ma_type mt
             LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
             LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
@@ -34,9 +33,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN ma_type_keeper mtk ON mtk.type_id = mt.type_id
             LEFT JOIN sys_user su ON su.user_id = mtk.user_id
         WHERE mt.`level` = '4' AND mt.`del_flag` = '0'
-        <if test="userId != null and userId != ''">
-            AND su.user_id =#{userId}
-        </if>
         <if test="typeName != null and typeName != ''">
             AND mt2.type_name like concat('%', #{typeName}, '%')
         </if>