diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java
index 9fa377a..bc3d1aa 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java
@@ -245,6 +245,15 @@ public class AuthAdminController {
         // 插入角色
         if (authAdminSaveRequest.getRoles() != null) {
             authRoleAdminService.insertRolesAdminIdAll(authAdminSaveRequest.getRoles(), authAdmin.getId());
+        } else {
+            List<AuthRoleAdmin> authRoleAdmins = authRoleAdminService.listByAdminId(curUser.getId());
+            List<Long> roles = new ArrayList<>();
+            if (!authRoleAdmins.isEmpty()) {
+                for (AuthRoleAdmin authRoleAdmin : authRoleAdmins) {
+                    roles.add(authRoleAdmin.getRole_id());
+                }
+                authRoleAdminService.insertRolesAdminIdAll(roles, authAdmin.getId());
+            }
         }
 
         Map<String, Long> res = new HashMap<>();
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java
index 6178b7e..8bb45e4 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java
@@ -3,6 +3,7 @@ package com.glxp.sale.admin.controller.inout;
 import com.github.pagehelper.PageInfo;
 import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
 import com.glxp.sale.admin.constant.Constant;
+import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity;
 import com.glxp.sale.admin.entity.basic.StockPrintEntity;
 import com.glxp.sale.admin.entity.info.CompanyEntity;
 import com.glxp.sale.admin.entity.inout.StockOrderDetailEntity;
@@ -23,6 +24,7 @@ import com.glxp.sale.admin.req.itextpdf.StockQRCodeTextPDFTemplateRequest;
 import com.glxp.sale.admin.req.itextpdf.SystemPDFTemplateRelevanceRequest;
 import com.glxp.sale.admin.res.PageSimpleResponse;
 import com.glxp.sale.admin.res.param.SystemPDFTemplateRelevanceResponse;
+import com.glxp.sale.admin.service.basic.BussinessLocalTypeService;
 import com.glxp.sale.admin.service.info.CompanyService;
 import com.glxp.sale.admin.service.inout.StockOrderDetailService;
 import com.glxp.sale.admin.service.inout.StockOrderService;
@@ -80,6 +82,8 @@ public class StockQRCodeTextController {
     private StockPrintTempService stockPrintTempService;
     @Resource
     private JaspaperService jaspaperService;
+    @Resource
+    private BussinessLocalTypeService bussinessLocalTypeService;
 
     @AuthRuleAnnotation("")
     @GetMapping("/udiwms/stock/qrcode/text/filter")
@@ -335,13 +339,18 @@ public class StockQRCodeTextController {
         if (stockOrderEntity == null) {
             return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到该订单");
         }
-
-        SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(2 + "");
-        if (systemPDFModuleEntity == null) return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误");
-        SystemPDFTemplateEntity systemPDFTemplateEntity =
-                systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId()));
-        if (systemPDFTemplateEntity == null) return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误");
-
+        SystemPDFTemplateRelevanceRequest systemPDFTemplateRelevanceRequest = new SystemPDFTemplateRelevanceRequest();
+        systemPDFTemplateRelevanceRequest.setModuleId(2);
+        systemPDFTemplateRelevanceRequest.setLocalAction(stockOrderEntity.getBillType());
+        List<SystemPDFTemplateRelevanceResponse> systemPDFTemplateRelevanceResponses = systemPDFTemplateRelevanceService.filterList(systemPDFTemplateRelevanceRequest);
+        if (systemPDFTemplateRelevanceResponses.isEmpty()) {
+            return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误");
+        } else {
+            SystemPDFTemplateRelevanceResponse systemPDFTemplateRelevanceResponse = systemPDFTemplateRelevanceResponses.get(0);
+            SystemPDFTemplateEntity systemPDFTemplateEntity =
+                    systemPDFTemplateService.selectById(String.valueOf(systemPDFTemplateRelevanceResponse.getTemplateId()));
+            if (systemPDFTemplateEntity == null) return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误");
+        }
         return ResultVOUtils.success();
     }
 
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/WarehouseUserEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/WarehouseUserEntity.java
index c22db91..9f4623c 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/WarehouseUserEntity.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/WarehouseUserEntity.java
@@ -32,4 +32,6 @@ public class WarehouseUserEntity {
      */
     private boolean isDirector;
 
+    private String employeeName;
+
 }
\ No newline at end of file
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessLocalTypeFilterRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessLocalTypeFilterRequest.java
index 51a70f0..30668f8 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessLocalTypeFilterRequest.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessLocalTypeFilterRequest.java
@@ -14,5 +14,6 @@ public class BussinessLocalTypeFilterRequest extends ListPageRequest {
     private Boolean changeEnable;
     private Boolean spUse;
     private Boolean isFilter;
+    private String code;
 
 }
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterUdiInfoRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterUdiInfoRequest.java
index 432ebeb..c44e3f8 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterUdiInfoRequest.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterUdiInfoRequest.java
@@ -46,4 +46,10 @@ public class FilterUdiInfoRequest extends ListPageRequest {
     private String corpId;
     private String billType;
 
+    private String ybbm;
+    private String sptm;
+    private String unionFilterStr;//产品名称，规格，批文，生产厂家联合查询
+
+
+
 }
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/OrderFilterRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/OrderFilterRequest.java
index 3f9de86..a7ccbb8 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/OrderFilterRequest.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/OrderFilterRequest.java
@@ -30,5 +30,6 @@ public class OrderFilterRequest extends ListPageRequest {
     private Integer reviewUser;
 
     private Integer userId;
+    private String locStorageCode;
 
 }
diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml
index 422fd1c..48c405e 100644
--- a/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml
@@ -134,6 +134,8 @@
     </delete>
 
     <select id="selectHospitalUser" resultType="com.glxp.sale.admin.entity.auth.AuthAdmin">
-        select id, userName from auth_user where CustomerId = 110
+        select *
+        from auth_user
+        where CustomerId = 110
     </select>
 </mapper>
\ No newline at end of file
diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml
index a16ba13..9872128 100644
--- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml
@@ -35,7 +35,8 @@
         basic_bussiness_type.action,basic_bussiness_type.checkEnable,basic_bustype_local.advanceType,basic_bustype_local.changeEnable,
         basic_bustype_local.spUse,basic_bussiness_type.storageCode,basic_bussiness_type.corpType,basic_bussiness_type.mainAction
         FROM basic_bustype_local
-        inner join basic_bussiness_type on basic_bustype_local.action = basic_bussiness_type.localAction
+        inner join basic_bussiness_type
+        on basic_bustype_local.action = basic_bussiness_type.localAction
         <where>
             <if test="name != ''and name != null">
                 AND basic_bustype_local.name LIKE concat(#{name},'%')
@@ -84,6 +85,9 @@
             <if test="spUse != ''and spUse != null">
                 AND spUse =#{spUse}
             </if>
+            <if test="code != ''and code != null">
+                AND inv_warehouse_user.`code` = #{code}
+            </if>
         </where>
     </select>
 
diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
index 55c88ce..6847ad5 100644
--- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
@@ -125,7 +125,8 @@
         (action,name,enable,remark,mainAction,localAction,thirdSysFk,
         checkEnable,genUnit,innerOrder,secCheckEnable,
         checkUdims,checkPdaEd,checkPdaUn,checkPc,checkWebNew,checkChange
-        ,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,secCheckChange,corpType,basic_bussiness_type.storageCode)
+        ,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,
+        secCheckChange,corpType,basic_bussiness_type.storageCode)
         values
             (
         #{action},
diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
index a31be5f..ea6e1a7 100644
--- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@@ -65,6 +65,12 @@
             <if test="mainId != '' and mainId != null">
                 AND mainId = #{mainId}
             </if>
+            <if test="unionFilterStr != '' and unionFilterStr != null">
+                or basic_products.cpmctymc LIKE concat('%',#{unionFilterStr},'%')
+                or basic_products.ylqxzcrbarmc LIKE concat('%',#{unionFilterStr},'%')
+                or basic_products.ggxh LIKE concat('%',#{unionFilterStr},'%')
+                or basic_products.zczbhhzbapzbh LIKE concat('%',#{unionFilterStr},'%')
+            </if>
             <if test="isAdavence != '' and isAdavence != null">
                 AND isAdavence = #{isAdavence}
             </if>
diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
index f6b6eea..bf45065 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
@@ -144,7 +144,7 @@
         INNER JOIN inv_warehouse_user on io_order.locStorageCode = inv_warehouse_user.`code`
         <where>
             <if test="id != '' and id!=null">
-                and id =#{id}
+                and io_order.id =#{id}
             </if>
             <if test="mainAction != '' and mainAction!=null">
                 and mainAction =#{mainAction}
@@ -194,10 +194,10 @@
             <if test="customerId != '' and customerId!=null">
                 and customerId =#{customerId}
             </if>
-            <if test=" createUser!=null">
+            <if test="createUser!=null">
                 and createUser =#{createUser}
             </if>
-            <if test=" reviewUser!=null">
+            <if test="reviewUser!=null">
                 and reviewUser =#{reviewUser}
             </if>
             <if test="ullageSupNo != '' and ullageSupNo!=null">
@@ -206,6 +206,10 @@
             <if test="userId!=null">
                 and inv_warehouse_user.userId =#{userId}
             </if>
+            <if test="locStorageCode!=null">
+                and locStorageCode =#{locStorageCode}
+            </if>
+
         </where>
         ORDER BY actDate DESC
 
@@ -217,7 +221,7 @@
         INNER JOIN inv_warehouse_user on io_order.locStorageCode = inv_warehouse_user.`code`
         <where>
             <if test="id != '' and id!=null">
-                and id =#{id}
+                and io_order.id =#{id}
             </if>
             <if test="mainAction != '' and mainAction!=null">
                 and mainAction =#{mainAction}
@@ -273,6 +277,9 @@
             <if test="userId!=null">
                 and inv_warehouse_user.userId =#{userId}
             </if>
+            <if test="locStorageCode!=null">
+                and locStorageCode =#{locStorageCode}
+            </if>
         </where>
         ORDER BY actDate DESC
     </select>
@@ -284,7 +291,7 @@
         INNER JOIN inv_warehouse_user on io_order.locStorageCode = inv_warehouse_user.`code`
         <where>
             <if test="id != '' and id!=null">
-                and id =#{id}
+                and io_order.id =#{id}
             </if>
             <if test="mainAction != '' and mainAction!=null">
                 and mainAction =#{mainAction}
@@ -340,17 +347,20 @@
             <if test="userId!=null">
                 and inv_warehouse_user.userId =#{userId}
             </if>
+            <if test="locStorageCode!=null">
+                and locStorageCode =#{locStorageCode}
+            </if>
         </where>
         ORDER BY actDate DESC
     </select>
 
     <select id="filterNoSort" parameterType="com.glxp.sale.admin.req.inout.OrderFilterRequest"
             resultType="com.glxp.sale.admin.entity.inout.OrderEntity">
-        SELECT * FROM io_order
+        SELECT io_order.* FROM io_order
         INNER JOIN inv_warehouse_user on io_order.locStorageCode = inv_warehouse_user.`code`
         <where>
             <if test="id != '' and id!=null">
-                and id =#{id}
+                and io_order.id =#{id}
             </if>
             <if test="mainAction != '' and mainAction!=null">
                 and mainAction =#{mainAction}
@@ -400,6 +410,9 @@
             <if test="userId!=null">
                 and inv_warehouse_user.userId =#{userId}
             </if>
+            <if test="locStorageCode!=null">
+                and locStorageCode =#{locStorageCode}
+            </if>
         </where>
 
     </select>
diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml
index 2726c13..2c39820 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml
@@ -1,237 +1,247 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.sale.admin.dao.inout.WarehouseBussinessTypeDao">
-  <resultMap id="BaseResultMap" type="com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity">
-    <!--@mbg.generated-->
-    <!--@Table inv_warehouse_bussiness_type-->
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="code" jdbcType="VARCHAR" property="code" />
-    <result column="action" jdbcType="VARCHAR" property="action" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id, code, `action`, `name`
-  </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    <!--@mbg.generated-->
-    select 
-    <include refid="Base_Column_List" />
-    from inv_warehouse_bussiness_type
-    where id = #{id,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    <!--@mbg.generated-->
-    delete from inv_warehouse_bussiness_type
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity" useGeneratedKeys="true">
-    <!--@mbg.generated-->
-    insert into inv_warehouse_bussiness_type (code, `action`, `name`
-      )
-    values (#{code,jdbcType=VARCHAR}, #{action,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}
-      )
-  </insert>
-  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity" useGeneratedKeys="true">
-    <!--@mbg.generated-->
-    insert into inv_warehouse_bussiness_type
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="code != null">
-        code,
-      </if>
-      <if test="action != null">
-        `action`,
-      </if>
-      <if test="name != null">
-        `name`,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="code != null">
-        #{code,jdbcType=VARCHAR},
-      </if>
-      <if test="action != null">
-        #{action,jdbcType=VARCHAR},
-      </if>
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity">
-    <!--@mbg.generated-->
-    update inv_warehouse_bussiness_type
-    <set>
-      <if test="code != null">
-        code = #{code,jdbcType=VARCHAR},
-      </if>
-      <if test="action != null">
+    <resultMap id="BaseResultMap" type="com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity">
+        <!--@mbg.generated-->
+        <!--@Table inv_warehouse_bussiness_type-->
+        <id column="id" jdbcType="INTEGER" property="id"/>
+        <result column="code" jdbcType="VARCHAR" property="code"/>
+        <result column="action" jdbcType="VARCHAR" property="action"/>
+        <result column="name" jdbcType="VARCHAR" property="name"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        <!--@mbg.generated-->
+        id, code, `action`, `name`
+    </sql>
+    <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+        <!--@mbg.generated-->
+        select
+        <include refid="Base_Column_List"/>
+        from inv_warehouse_bussiness_type
+        where id = #{id,jdbcType=INTEGER}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+        <!--@mbg.generated-->
+        delete from inv_warehouse_bussiness_type
+        where id = #{id,jdbcType=INTEGER}
+    </delete>
+    <insert id="insert" keyColumn="id" keyProperty="id"
+            parameterType="com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity" useGeneratedKeys="true">
+        <!--@mbg.generated-->
+        insert into inv_warehouse_bussiness_type (code, `action`, `name`
+        )
+        values (#{code,jdbcType=VARCHAR}, #{action,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}
+        )
+    </insert>
+    <insert id="insertSelective" keyColumn="id" keyProperty="id"
+            parameterType="com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity" useGeneratedKeys="true">
+        <!--@mbg.generated-->
+        insert into inv_warehouse_bussiness_type
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="code != null">
+                code,
+            </if>
+            <if test="action != null">
+                `action`,
+            </if>
+            <if test="name != null">
+                `name`,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="code != null">
+                #{code,jdbcType=VARCHAR},
+            </if>
+            <if test="action != null">
+                #{action,jdbcType=VARCHAR},
+            </if>
+            <if test="name != null">
+                #{name,jdbcType=VARCHAR},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective"
+            parameterType="com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity">
+        <!--@mbg.generated-->
+        update inv_warehouse_bussiness_type
+        <set>
+            <if test="code != null">
+                code = #{code,jdbcType=VARCHAR},
+            </if>
+            <if test="action != null">
+                `action` = #{action,jdbcType=VARCHAR},
+            </if>
+            <if test="name != null">
+                `name` = #{name,jdbcType=VARCHAR},
+            </if>
+        </set>
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+    <update id="updateByPrimaryKey" parameterType="com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity">
+        <!--@mbg.generated-->
+        update inv_warehouse_bussiness_type
+        set code = #{code,jdbcType=VARCHAR},
         `action` = #{action,jdbcType=VARCHAR},
-      </if>
-      <if test="name != null">
-        `name` = #{name,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity">
-    <!--@mbg.generated-->
-    update inv_warehouse_bussiness_type
-    set code = #{code,jdbcType=VARCHAR},
-      `action` = #{action,jdbcType=VARCHAR},
-      `name` = #{name,jdbcType=VARCHAR}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateBatch" parameterType="java.util.List">
-    <!--@mbg.generated-->
-    update inv_warehouse_bussiness_type
-    <trim prefix="set" suffixOverrides=",">
-      <trim prefix="code = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.code,jdbcType=VARCHAR}
-        </foreach>
-      </trim>
-      <trim prefix="`action` = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.action,jdbcType=VARCHAR}
+        `name` = #{name,jdbcType=VARCHAR}
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+    <update id="updateBatch" parameterType="java.util.List">
+        <!--@mbg.generated-->
+        update inv_warehouse_bussiness_type
+        <trim prefix="set" suffixOverrides=",">
+            <trim prefix="code = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.code,jdbcType=VARCHAR}
+                </foreach>
+            </trim>
+            <trim prefix="`action` = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.action,jdbcType=VARCHAR}
+                </foreach>
+            </trim>
+            <trim prefix="`name` = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.name,jdbcType=VARCHAR}
+                </foreach>
+            </trim>
+        </trim>
+        where id in
+        <foreach close=")" collection="list" item="item" open="(" separator=", ">
+            #{item.id,jdbcType=INTEGER}
         </foreach>
-      </trim>
-      <trim prefix="`name` = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.name,jdbcType=VARCHAR}
+    </update>
+    <update id="updateBatchSelective" parameterType="java.util.List">
+        <!--@mbg.generated-->
+        update inv_warehouse_bussiness_type
+        <trim prefix="set" suffixOverrides=",">
+            <trim prefix="code = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.code != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.code,jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="`action` = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.action != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.action,jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="`name` = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.name != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.name,jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+        </trim>
+        where id in
+        <foreach close=")" collection="list" item="item" open="(" separator=", ">
+            #{item.id,jdbcType=INTEGER}
         </foreach>
-      </trim>
-    </trim>
-    where id in
-    <foreach close=")" collection="list" item="item" open="(" separator=", ">
-      #{item.id,jdbcType=INTEGER}
-    </foreach>
-  </update>
-  <update id="updateBatchSelective" parameterType="java.util.List">
-    <!--@mbg.generated-->
-    update inv_warehouse_bussiness_type
-    <trim prefix="set" suffixOverrides=",">
-      <trim prefix="code = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.code != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.code,jdbcType=VARCHAR}
-          </if>
+    </update>
+    <insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true">
+        <!--@mbg.generated-->
+        insert into inv_warehouse_bussiness_type
+        (code, `action`, `name`)
+        values
+        <foreach collection="list" item="item" separator=",">
+            (#{item.code,jdbcType=VARCHAR}, #{item.action,jdbcType=VARCHAR}, #{item.name,jdbcType=VARCHAR}
+            )
         </foreach>
-      </trim>
-      <trim prefix="`action` = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.action != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.action,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="`name` = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.name != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.name,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-    </trim>
-    where id in
-    <foreach close=")" collection="list" item="item" open="(" separator=", ">
-      #{item.id,jdbcType=INTEGER}
-    </foreach>
-  </update>
-  <insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true">
-    <!--@mbg.generated-->
-    insert into inv_warehouse_bussiness_type
-    (code, `action`, `name`)
-    values
-    <foreach collection="list" item="item" separator=",">
-      (#{item.code,jdbcType=VARCHAR}, #{item.action,jdbcType=VARCHAR}, #{item.name,jdbcType=VARCHAR}
-        )
-    </foreach>
-  </insert>
-  <insert id="insertOrUpdate" keyColumn="id" keyProperty="id" parameterType="com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity" useGeneratedKeys="true">
-    <!--@mbg.generated-->
-    insert into inv_warehouse_bussiness_type
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      code,
-      `action`,
-      `name`,
-    </trim>
-    values
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
-      #{code,jdbcType=VARCHAR},
-      #{action,jdbcType=VARCHAR},
-      #{name,jdbcType=VARCHAR},
-    </trim>
-    on duplicate key update 
-    <trim suffixOverrides=",">
-      <if test="id != null">
-        id = #{id,jdbcType=INTEGER},
-      </if>
-      code = #{code,jdbcType=VARCHAR},
-      `action` = #{action,jdbcType=VARCHAR},
-      `name` = #{name,jdbcType=VARCHAR},
-    </trim>
-  </insert>
-  <insert id="insertOrUpdateSelective" keyColumn="id" keyProperty="id" parameterType="com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity" useGeneratedKeys="true">
-    <!--@mbg.generated-->
-    insert into inv_warehouse_bussiness_type
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="code != null">
-        code,
-      </if>
-      <if test="action != null">
-        `action`,
-      </if>
-      <if test="name != null">
-        `name`,
-      </if>
-    </trim>
-    values
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
-      <if test="code != null">
-        #{code,jdbcType=VARCHAR},
-      </if>
-      <if test="action != null">
-        #{action,jdbcType=VARCHAR},
-      </if>
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-    </trim>
-    on duplicate key update 
-    <trim suffixOverrides=",">
-      <if test="id != null">
-        id = #{id,jdbcType=INTEGER},
-      </if>
-      <if test="code != null">
-        code = #{code,jdbcType=VARCHAR},
-      </if>
-      <if test="action != null">
-        `action` = #{action,jdbcType=VARCHAR},
-      </if>
-      <if test="name != null">
-        `name` = #{name,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
+    </insert>
+    <insert id="insertOrUpdate" keyColumn="id" keyProperty="id"
+            parameterType="com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity" useGeneratedKeys="true">
+        <!--@mbg.generated-->
+        insert into inv_warehouse_bussiness_type
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            code,
+            `action`,
+            `name`,
+        </trim>
+        values
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            #{code,jdbcType=VARCHAR},
+            #{action,jdbcType=VARCHAR},
+            #{name,jdbcType=VARCHAR},
+        </trim>
+        on duplicate key update
+        <trim suffixOverrides=",">
+            <if test="id != null">
+                id = #{id,jdbcType=INTEGER},
+            </if>
+            code = #{code,jdbcType=VARCHAR},
+            `action` = #{action,jdbcType=VARCHAR},
+            `name` = #{name,jdbcType=VARCHAR},
+        </trim>
+    </insert>
+    <insert id="insertOrUpdateSelective" keyColumn="id" keyProperty="id"
+            parameterType="com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity" useGeneratedKeys="true">
+        <!--@mbg.generated-->
+        insert into inv_warehouse_bussiness_type
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            <if test="code != null">
+                code,
+            </if>
+            <if test="action != null">
+                `action`,
+            </if>
+            <if test="name != null">
+                `name`,
+            </if>
+        </trim>
+        values
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            <if test="code != null">
+                #{code,jdbcType=VARCHAR},
+            </if>
+            <if test="action != null">
+                #{action,jdbcType=VARCHAR},
+            </if>
+            <if test="name != null">
+                #{name,jdbcType=VARCHAR},
+            </if>
+        </trim>
+        on duplicate key update
+        <trim suffixOverrides=",">
+            <if test="id != null">
+                id = #{id,jdbcType=INTEGER},
+            </if>
+            <if test="code != null">
+                code = #{code,jdbcType=VARCHAR},
+            </if>
+            <if test="action != null">
+                `action` = #{action,jdbcType=VARCHAR},
+            </if>
+            <if test="name != null">
+                `name` = #{name,jdbcType=VARCHAR},
+            </if>
+        </trim>
+    </insert>
 
-  <select id="selectListByCode" resultMap="BaseResultMap">
-    select * from inv_warehouse_bussiness_type where code = #{code}
+    <select id="selectListByCode" resultMap="BaseResultMap">
+        select inv_warehouse_bussiness_type.code, inv_warehouse_bussiness_type.action, basic_bussiness_type.name
+        from inv_warehouse_bussiness_type
+                 inner join basic_bussiness_type on inv_warehouse_bussiness_type.action = basic_bussiness_type.action
+        where code = #{code}
     </select>
 
-  <delete id="deleteByCode">
-    delete from inv_warehouse_bussiness_type where code = #{code}
-  </delete>
+    <delete id="deleteByCode">
+        delete
+        from inv_warehouse_bussiness_type
+        where code = #{code}
+    </delete>
 </mapper>
\ No newline at end of file
diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml
index 80e45f9..44dcb96 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml
@@ -1,252 +1,266 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.sale.admin.dao.inout.WarehouseUserDao">
-  <resultMap id="BaseResultMap" type="com.glxp.sale.admin.entity.inout.WarehouseUserEntity">
-    <!--@mbg.generated-->
-    <!--@Table inv_warehouse_user-->
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="code" jdbcType="VARCHAR" property="code" />
-    <result column="userId" jdbcType="BIGINT" property="userid" />
-    <result column="userName" jdbcType="VARCHAR" property="username" />
-    <result column="isDirector" javaType="boolean" property="isDirector" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id, code, userId, userName, isDirector
-  </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    <!--@mbg.generated-->
-    select 
-    <include refid="Base_Column_List" />
-    from inv_warehouse_user
-    where id = #{id,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    <!--@mbg.generated-->
-    delete from inv_warehouse_user
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.glxp.sale.admin.entity.inout.WarehouseUserEntity" useGeneratedKeys="true">
-    <!--@mbg.generated-->
-    insert into inv_warehouse_user (code, userId, userName, isDirector
-      )
-    values (#{code,jdbcType=VARCHAR}, #{userid,jdbcType=BIGINT}, #{username,jdbcType=VARCHAR}, #{isDirector}
-      )
-  </insert>
-  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.glxp.sale.admin.entity.inout.WarehouseUserEntity" useGeneratedKeys="true">
-    <!--@mbg.generated-->
-    insert into inv_warehouse_user
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="code != null">
-        code,
-      </if>
-      <if test="userid != null">
-        userId,
-      </if>
-      <if test="username != null">
-        userName,
-      </if>
-      isDirector
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="code != null">
-        #{code,jdbcType=VARCHAR},
-      </if>
-      <if test="userid != null">
-        #{userid,jdbcType=BIGINT},
-      </if>
-      <if test="username != null">
-        #{username,jdbcType=VARCHAR},
-      </if>
-      #{isDirector}
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.glxp.sale.admin.entity.inout.WarehouseUserEntity">
-    <!--@mbg.generated-->
-    update inv_warehouse_user
-    <set>
-      <if test="code != null">
-        code = #{code,jdbcType=VARCHAR},
-      </if>
-      <if test="userid != null">
+    <resultMap id="BaseResultMap" type="com.glxp.sale.admin.entity.inout.WarehouseUserEntity">
+        <!--@mbg.generated-->
+        <!--@Table inv_warehouse_user-->
+        <id column="id" jdbcType="INTEGER" property="id"/>
+        <result column="code" jdbcType="VARCHAR" property="code"/>
+        <result column="userId" jdbcType="BIGINT" property="userid"/>
+        <result column="userName" jdbcType="VARCHAR" property="username"/>
+        <result column="isDirector" javaType="boolean" property="isDirector"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        <!--@mbg.generated-->
+        id, code, userId, userName, isDirector
+    </sql>
+    <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+        <!--@mbg.generated-->
+        select
+        <include refid="Base_Column_List"/>
+        from inv_warehouse_user
+        where id = #{id,jdbcType=INTEGER}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+        <!--@mbg.generated-->
+        delete from inv_warehouse_user
+        where id = #{id,jdbcType=INTEGER}
+    </delete>
+    <insert id="insert" keyColumn="id" keyProperty="id"
+            parameterType="com.glxp.sale.admin.entity.inout.WarehouseUserEntity" useGeneratedKeys="true">
+        <!--@mbg.generated-->
+        insert into inv_warehouse_user (code, userId, userName, isDirector
+        )
+        values (#{code,jdbcType=VARCHAR}, #{userid,jdbcType=BIGINT}, #{username,jdbcType=VARCHAR}, #{isDirector}
+        )
+    </insert>
+    <insert id="insertSelective" keyColumn="id" keyProperty="id"
+            parameterType="com.glxp.sale.admin.entity.inout.WarehouseUserEntity" useGeneratedKeys="true">
+        <!--@mbg.generated-->
+        insert into inv_warehouse_user
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="code != null">
+                code,
+            </if>
+            <if test="userid != null">
+                userId,
+            </if>
+            <if test="username != null">
+                userName,
+            </if>
+            isDirector
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="code != null">
+                #{code,jdbcType=VARCHAR},
+            </if>
+            <if test="userid != null">
+                #{userid,jdbcType=BIGINT},
+            </if>
+            <if test="username != null">
+                #{username,jdbcType=VARCHAR},
+            </if>
+            #{isDirector}
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.glxp.sale.admin.entity.inout.WarehouseUserEntity">
+        <!--@mbg.generated-->
+        update inv_warehouse_user
+        <set>
+            <if test="code != null">
+                code = #{code,jdbcType=VARCHAR},
+            </if>
+            <if test="userid != null">
+                userId = #{userid,jdbcType=BIGINT},
+            </if>
+            <if test="username != null">
+                userName = #{username,jdbcType=VARCHAR},
+            </if>
+        </set>
+        isDirector = #{isDirector}
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+    <update id="updateByPrimaryKey" parameterType="com.glxp.sale.admin.entity.inout.WarehouseUserEntity">
+        <!--@mbg.generated-->
+        update inv_warehouse_user
+        set code = #{code,jdbcType=VARCHAR},
         userId = #{userid,jdbcType=BIGINT},
-      </if>
-      <if test="username != null">
-        userName = #{username,jdbcType=VARCHAR},
-      </if>
-    </set>
-    isDirector = #{isDirector}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.glxp.sale.admin.entity.inout.WarehouseUserEntity">
-    <!--@mbg.generated-->
-    update inv_warehouse_user
-    set code = #{code,jdbcType=VARCHAR},
-      userId = #{userid,jdbcType=BIGINT},
-      userName = #{username,jdbcType=VARCHAR}
-      isDirector = #{isDirector}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateBatch" parameterType="java.util.List">
-    <!--@mbg.generated-->
-    update inv_warehouse_user
-    <trim prefix="set" suffixOverrides=",">
-      <trim prefix="code = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.code,jdbcType=VARCHAR}
-        </foreach>
-      </trim>
-      <trim prefix="userId = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.userid,jdbcType=BIGINT}
-        </foreach>
-      </trim>
-      <trim prefix="userName = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.username,jdbcType=VARCHAR}
+        userName = #{username,jdbcType=VARCHAR}
+        isDirector = #{isDirector}
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+    <update id="updateBatch" parameterType="java.util.List">
+        <!--@mbg.generated-->
+        update inv_warehouse_user
+        <trim prefix="set" suffixOverrides=",">
+            <trim prefix="code = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.code,jdbcType=VARCHAR}
+                </foreach>
+            </trim>
+            <trim prefix="userId = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.userid,jdbcType=BIGINT}
+                </foreach>
+            </trim>
+            <trim prefix="userName = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.username,jdbcType=VARCHAR}
+                </foreach>
+            </trim>
+        </trim>
+        where id in
+        <foreach close=")" collection="list" item="item" open="(" separator=", ">
+            #{item.id,jdbcType=INTEGER}
         </foreach>
-      </trim>
-    </trim>
-    where id in
-    <foreach close=")" collection="list" item="item" open="(" separator=", ">
-      #{item.id,jdbcType=INTEGER}
-    </foreach>
-  </update>
-  <update id="updateBatchSelective" parameterType="java.util.List">
-    <!--@mbg.generated-->
-    update inv_warehouse_user
-    <trim prefix="set" suffixOverrides=",">
-      <trim prefix="code = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.code != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.code,jdbcType=VARCHAR}
-          </if>
+    </update>
+    <update id="updateBatchSelective" parameterType="java.util.List">
+        <!--@mbg.generated-->
+        update inv_warehouse_user
+        <trim prefix="set" suffixOverrides=",">
+            <trim prefix="code = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.code != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.code,jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="userId = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.userid != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.userid,jdbcType=BIGINT}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="userName = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.username != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.username,jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+        </trim>
+        where id in
+        <foreach close=")" collection="list" item="item" open="(" separator=", ">
+            #{item.id,jdbcType=INTEGER}
         </foreach>
-      </trim>
-      <trim prefix="userId = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.userid != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.userid,jdbcType=BIGINT}
-          </if>
+    </update>
+    <insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true">
+        <!--@mbg.generated-->
+        insert into inv_warehouse_user
+        (code, userId, userName, isDirector)
+        values
+        <foreach collection="list" item="item" separator=",">
+            (#{item.code,jdbcType=VARCHAR}, #{item.userid,jdbcType=BIGINT}, #{item.username,jdbcType=VARCHAR},
+            #{item.isDirector}
+            )
         </foreach>
-      </trim>
-      <trim prefix="userName = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.username != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.username,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-    </trim>
-    where id in
-    <foreach close=")" collection="list" item="item" open="(" separator=", ">
-      #{item.id,jdbcType=INTEGER}
-    </foreach>
-  </update>
-  <insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true">
-    <!--@mbg.generated-->
-    insert into inv_warehouse_user
-    (code, userId, userName, isDirector)
-    values
-    <foreach collection="list" item="item" separator=",">
-      (#{item.code,jdbcType=VARCHAR}, #{item.userid,jdbcType=BIGINT}, #{item.username,jdbcType=VARCHAR}, #{item.isDirector}
-        )
-    </foreach>
-  </insert>
-  <insert id="insertOrUpdate" keyColumn="id" keyProperty="id" parameterType="com.glxp.sale.admin.entity.inout.WarehouseUserEntity" useGeneratedKeys="true">
-    <!--@mbg.generated-->
-    insert into inv_warehouse_user
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      code,
-      userId,
-      userName,
-      isDirector,
-    </trim>
-    values
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
-      #{code,jdbcType=VARCHAR},
-      #{userid,jdbcType=BIGINT},
-      #{username,jdbcType=VARCHAR},
-      #{isDirector}
-    </trim>
-    on duplicate key update 
-    <trim suffixOverrides=",">
-      <if test="id != null">
-        id = #{id,jdbcType=INTEGER},
-      </if>
-      code = #{code,jdbcType=VARCHAR},
-      userId = #{userid,jdbcType=BIGINT},
-      userName = #{username,jdbcType=VARCHAR},
-    </trim>
-  </insert>
-  <insert id="insertOrUpdateSelective" keyColumn="id" keyProperty="id" parameterType="com.glxp.sale.admin.entity.inout.WarehouseUserEntity" useGeneratedKeys="true">
-    <!--@mbg.generated-->
-    insert into inv_warehouse_user
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="code != null">
-        code,
-      </if>
-      <if test="userid != null">
-        userId,
-      </if>
-      <if test="username != null">
-        userName,
-      </if>
-    </trim>
-    values
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
-      <if test="code != null">
-        #{code,jdbcType=VARCHAR},
-      </if>
-      <if test="userid != null">
-        #{userid,jdbcType=BIGINT},
-      </if>
-      <if test="username != null">
-        #{username,jdbcType=VARCHAR},
-      </if>
-    </trim>
-    on duplicate key update 
-    <trim suffixOverrides=",">
-      <if test="id != null">
-        id = #{id,jdbcType=INTEGER},
-      </if>
-      <if test="code != null">
-        code = #{code,jdbcType=VARCHAR},
-      </if>
-      <if test="userid != null">
-        userId = #{userid,jdbcType=BIGINT},
-      </if>
-      <if test="username != null">
-        userName = #{username,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
+    </insert>
+    <insert id="insertOrUpdate" keyColumn="id" keyProperty="id"
+            parameterType="com.glxp.sale.admin.entity.inout.WarehouseUserEntity" useGeneratedKeys="true">
+        <!--@mbg.generated-->
+        insert into inv_warehouse_user
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            code,
+            userId,
+            userName,
+            isDirector,
+        </trim>
+        values
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            #{code,jdbcType=VARCHAR},
+            #{userid,jdbcType=BIGINT},
+            #{username,jdbcType=VARCHAR},
+            #{isDirector}
+        </trim>
+        on duplicate key update
+        <trim suffixOverrides=",">
+            <if test="id != null">
+                id = #{id,jdbcType=INTEGER},
+            </if>
+            code = #{code,jdbcType=VARCHAR},
+            userId = #{userid,jdbcType=BIGINT},
+            userName = #{username,jdbcType=VARCHAR},
+        </trim>
+    </insert>
+    <insert id="insertOrUpdateSelective" keyColumn="id" keyProperty="id"
+            parameterType="com.glxp.sale.admin.entity.inout.WarehouseUserEntity" useGeneratedKeys="true">
+        <!--@mbg.generated-->
+        insert into inv_warehouse_user
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            <if test="code != null">
+                code,
+            </if>
+            <if test="userid != null">
+                userId,
+            </if>
+            <if test="username != null">
+                userName,
+            </if>
+        </trim>
+        values
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            <if test="code != null">
+                #{code,jdbcType=VARCHAR},
+            </if>
+            <if test="userid != null">
+                #{userid,jdbcType=BIGINT},
+            </if>
+            <if test="username != null">
+                #{username,jdbcType=VARCHAR},
+            </if>
+        </trim>
+        on duplicate key update
+        <trim suffixOverrides=",">
+            <if test="id != null">
+                id = #{id,jdbcType=INTEGER},
+            </if>
+            <if test="code != null">
+                code = #{code,jdbcType=VARCHAR},
+            </if>
+            <if test="userid != null">
+                userId = #{userid,jdbcType=BIGINT},
+            </if>
+            <if test="username != null">
+                userName = #{username,jdbcType=VARCHAR},
+            </if>
+        </trim>
+    </insert>
 
-  <select id="selectListByCode" resultMap="BaseResultMap">
-    select * from inv_warehouse_user where code = #{code}
-  </select>
+    <select id="selectListByCode" resultMap="BaseResultMap">
+        select inv_warehouse_user.*, auth_user.employeeName
+        from inv_warehouse_user
+        inner join auth_user on auth_user.id = inv_warehouse_user.userId
+        where code = #{code}
+    </select>
 
-  <delete id="deleteByCode">
-    delete from inv_warehouse_user where code = #{code}
-  </delete>
+    <delete id="deleteByCode">
+        delete
+        from inv_warehouse_user
+        where code = #{code}
+    </delete>
 
-  <update id="updateDirector">
-    update inv_warehouse_user set isDirector = #{isDirector} where code = #{code}
-  </update>
+    <update id="updateDirector">
+        update inv_warehouse_user
+        set isDirector = #{isDirector}
+        where code = #{code}
+    </update>
 
-  <update id="updateDirectorById">
-    update inv_warehouse_user set isDirector = #{isDirector} where id = #{id}
-  </update>
+    <update id="updateDirectorById">
+        update inv_warehouse_user
+        set isDirector = #{isDirector}
+        where id = #{id}
+    </update>
 </mapper>
\ No newline at end of file