Merge branch 'dev' into dev_v3.0.5

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/warehouse/WarehouseApplicationService.java

@@ -23,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import com.mhd.common.core.utils.StringUtils;
 
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -98,6 +99,13 @@ public class WarehouseApplicationService {
                 }
             }
         }
+        String orgIds = warehouseDO.getOrgIds();
+        if (StringUtils.isNotEmpty(orgIds)) {
+            String[] orgIdArray = orgIds.split(",");
+            List<Long> orgIdList = Arrays.stream(orgIdArray).map(Long::valueOf).collect(Collectors.toList());
+            warehouseDO.setOrgIdList(orgIdList);
+            warehouseDO.setOrganizationId(null);
+        }
         return warehouseDomainService.queryList(warehouseDO);
     }
 
@@ -314,4 +322,4 @@ public class WarehouseApplicationService {
         return warehouseDomainService.getWarehouseChildren(warehouseId, storageLocationType);
     }
 
-}
+}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/repository/todo/WarehouseDO.java

@@ -127,4 +127,8 @@ public class WarehouseDO extends BaseVOEntity{
     private Integer isEnable;
     @ApiModelProperty("仓库id 集合")
     private List<Long> warehouseIds;
+    @ApiModelProperty("组织id 集合")
+    private String orgIds;
+    @ApiModelProperty("组织id 集合")
+    private List<Long> orgIdList;
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/warehouse/WarehouseDTO.java

@@ -132,4 +132,8 @@ public class WarehouseDTO extends BaseVOEntity{
     @ApiModelProperty("是否启用: 1-否 2-是")
     @Excel(name = "是否启用: 1-否 2-是")
     private Integer isEnable;
+    @ApiModelProperty("组织id 集合")
+    private String orgIds;
+    @ApiModelProperty("组织id 集合")
+    private List<Long> orgIdList;
 }

mhd-modules/mhd-system/src/main/resources/mapper/basic/warehouse/WarehouseMapper.xml

@@ -130,6 +130,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item}
             </foreach>
         </if>
+        <if test="orgIdList != null and orgIdList.size > 0 ">
+            and organization_id in
+            <foreach collection="orgIdList" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <choose>
             <when test="delFlag != null"> and del_flag = #{delFlag} </when>
             <otherwise> and del_flag = 1 </otherwise>