Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java

@@ -474,6 +474,7 @@ public class InvWarehouseController extends BaseController {
             return ResultVOUtils.error(500, "仓库编码不能为空！");
         FilterInvBusUserRequest filterInvBusUserRequest = new FilterInvBusUserRequest();
             filterInvBusUserRequest.setSubInvCode(relBusRequset.getInvCode());
+        filterInvBusUserRequest.setSelectedCodes(relBusRequset.getSelectActions());
             List<InvBusUserEntity> invBusUserEntities = invBusUserService.filterInvBusUser(filterInvBusUserRequest);
         List<String> objects = new ArrayList<>();
         List<String> objects2 = new ArrayList<>();

src/main/java/com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java

@@ -120,7 +120,7 @@ public class InvCountOrderServiceImpl implements InvCountOrderService {
     public BaseResponse saveCountOrder(InvCountOrderEntity invCountOrder) {
         if (invCountOrder.getCountType() == 0 || invCountOrder.getCountType() == 2) {
             //整库盘点
-            if (StrUtil.isNotBlank(invCountOrder.getDeptCode()) || StrUtil.isBlank(invCountOrder.getInvCode())) {
+            if (StrUtil.isBlank(invCountOrder.getDeptCode()) || StrUtil.isBlank(invCountOrder.getInvCode())) {
                 return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "请选择仓库信息！");
             }
         } else if (invCountOrder.getCountType() == 1) {

src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml

@@ -17,6 +17,12 @@
             <if test="scAction != '' and scAction != null">
                 AND scAction = #{scAction}
             </if>
+            <if test="selectedCodes != null and selectedCodes.size()!=0">
+                and scAction not in
+                <foreach collection="selectedCodes" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
 
         </where>
 

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -856,6 +856,7 @@
             <if test="isDisable != null">
                 AND isDisable = #{isDisable}
             </if>
+
         </where>
 
         group by basic_udirel.id