不通分库不通用户对应单据类型问题

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java

@@ -281,7 +281,7 @@ public class StockOrderController {
             CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(stockOrderFilterRequest.getCorpId()));
             if (companyEntity.getUnitIdFk().equals("110")) {
                 stockOrderFilterRequest.setUnitIdFk(null);
-                stockOrderFilterRequest.setUserId(customerService.getUserId());
+                stockOrderFilterRequest.setUserId(customerService.getUserId() + "");
             } else {
                 stockOrderFilterRequest.setUnitIdFk(companyEntity.getUnitIdFk());
             }
@@ -322,7 +322,7 @@ public class StockOrderController {
             if (customerId.equals(Constant.SYSTEM_CUSTOMER_ID)) {
                 Integer userId = customerService.getUserId();
                 stockOrderFilterRequest.setUnitIdFk(null);
-                stockOrderFilterRequest.setUserId(userId);
+                stockOrderFilterRequest.setUserId(userId + "");
             } else {
                 CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(customerId));
                 stockOrderFilterRequest.setUnitIdFk(companyEntity.getUnitIdFk());

api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderFilterRequest.java

@@ -33,7 +33,7 @@ public class StockOrderFilterRequest extends ListPageRequest {
     private String invWarehouseCode;
     private Integer createUser;
     private Integer reviewUser;
-    private Integer userId;
+    private String userId;
     private Integer unionUser;
     private String entrustUser;
     private boolean entrustEnd;

api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml

@@ -118,7 +118,7 @@
                 AND inv_warehouse_user.`code` = #{code}
             </if>
             <if test="userId != ''and userId != null">
-                AND inv_warehouse_user.`userId` = #{userId}
+                AND inv_bustype_user.`userId` = #{userId}
             </if>
         </where>
         group by basic_bussiness_type.action

api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml

@@ -142,6 +142,7 @@
         INNER JOIN inv_warehouse_sub on inv_warehouse_sub.`code` = inv_warehouse_bussiness_type.code
         INNER JOIN inv_warehouse on inv_warehouse_sub.parentId = inv_warehouse.`code`
         INNER JOIN inv_warehouse_user on inv_warehouse_sub.`code` =inv_warehouse_user.`code`
+        INNER JOIN inv_bustype_user on inv_warehouse_bussiness_type.action = inv_bustype_user.scAction
         <where>
             <if test="name != ''and name != null">
                 AND basic_bussiness_type.name LIKE concat('%',#{name},'%')
@@ -168,9 +169,8 @@
             <if test="locSubInvCode != ''and locSubInvCode != null">
                 AND inv_warehouse_sub.`code` =#{locSubInvCode}
             </if>
-
+            <if test="userId != ''and userId != null">
-            <if test="userId != null">
+                AND inv_bustype_user.`userId` = #{userId}
-                AND inv_warehouse_user.userId = #{userId}
             </if>
 
 

api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml

@@ -275,12 +275,14 @@
             </if>
             <if test="invWarehouseCode != '' and invWarehouseCode!=null">
                 and invWarehouseCode =#{invWarehouseCode}
-                and
+                <if test="userId != '' and userId!=null">
-                io_order.action in
+                    and
-                (select basic_bussiness_type.action from inv_bustype_user INNER JOIN basic_bussiness_type on
+                    io_order.action in
-                inv_bustype_user.scAction = basic_bussiness_type.action
+                    (select basic_bussiness_type.action from inv_bustype_user INNER JOIN basic_bussiness_type on
-                WHERE userId =#{userId} and invWarehouseCode =#{invWarehouseCode}
+                    inv_bustype_user.scAction = basic_bussiness_type.action
-                GROUP BY inv_bustype_user.id)
+                    WHERE userId =#{userId} and invWarehouseCode =#{invWarehouseCode}
+                    GROUP BY inv_bustype_user.id)
+                </if>
             </if>
 
         </where>

api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml

@@ -158,7 +158,7 @@
             <if test="localAction != '' and localAction!=null">
                 and billType = #{localAction}
             </if>
-            <if test="userId!=null">
+            <if test="userId != '' and userId!=null">
                 and (invWarehouseCode in (select code from inv_warehouse_user WHERE userId =#{userId}) or
                 invWarehouseCode is null or invWarehouseCode='')
             </if>
@@ -180,12 +180,15 @@
             </if>
             <if test="invWarehouseCode != '' and invWarehouseCode!=null">
                 and invWarehouseCode = #{invWarehouseCode}
-                and
+
-                stock_order.billType in
+                <if test="userId != '' and userId!=null">
-                (select basic_bussiness_type.localAction from inv_bustype_user INNER JOIN basic_bussiness_type on
+                    and
-                inv_bustype_user.scAction = basic_bussiness_type.action
+                    stock_order.billType in
-                WHERE userId =#{userId} and invWarehouseCode  =#{invWarehouseCode}
+                    (select basic_bussiness_type.localAction from inv_bustype_user INNER JOIN basic_bussiness_type on
-                GROUP BY inv_bustype_user.id)
+                    inv_bustype_user.scAction = basic_bussiness_type.action
+                    WHERE userId =#{userId} and invWarehouseCode =#{invWarehouseCode}
+                    GROUP BY inv_bustype_user.id)
+                </if>
             </if>
             <if test="createUser!=null">
                 and createUser = #{createUser}
@@ -309,7 +312,8 @@
         select io_codes.code udiCode,basic_udirel.id productId,basic_products.cpmctymc productName,basic_products.ggxh
         spec,io_codes.batchNo,io_codes.produceDate productDate,io_codes.expireDate ,io_codes.serialNo,io_codes.count,
         basic_products.ylqxzcrbarmc,basic_udirel.manufactory,basic_udirel.measname,basic_products.zczbhhzbapzbh,
-        inv_warehouse.name locInv, inv_warehouse_sub.name subInv, basic_products.spmc, basic_products.cpms,io_codes.nameCode,io_codes.relId
+        inv_warehouse.name locInv, inv_warehouse_sub.name subInv, basic_products.spmc,
+        basic_products.cpms,io_codes.nameCode,io_codes.relId
         from io_codes
         INNER JOIN basic_udirel on io_codes.relId = basic_udirel.id
         INNER JOIN basic_products on basic_products.uuid = basic_udirel.uuid