云南最新bug修改

src/main/java/com/chinaitop/depot/basic/controller/BasicWarehouseController.java

@@ -1,10 +1,7 @@
 package com.chinaitop.depot.basic.controller;
 
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -88,7 +85,18 @@ public class BasicWarehouseController {
 				criteria.andWarehouseIdEqualTo(warehouseId);
 			}
 			if (null != libraryType) {
-				criteria.andLibraryTypeEqualTo(libraryType);
+				//处理空仓报警问题
+				if(libraryType.length() == 1){
+					criteria.andLibraryTypeEqualTo(libraryType);
+				}else if(libraryType.length() > 3){
+					String[] libraryString = libraryType.substring(2).split(",");
+					Integer[] libraryInteger = new Integer[libraryString.length];
+					for (int i = 0; i < libraryString.length; i++) {
+						libraryInteger[i] = Integer.parseInt(libraryString[i]);
+					}
+					List<Integer> result = Arrays.asList(libraryInteger);
+					criteria.andWarehouseIdNotIn(result);
+				}
 			}
 
 			/* 查询当前库下的数据 */

src/main/java/com/chinaitop/depot/basic/service/BasicStorehouseService.java

@@ -80,7 +80,7 @@ public interface BasicStorehouseService {
 	 * 导入
 	 * 
 	 * @param list
-	 * @param depotInfo 
+	 * @param depotInfo
 	 * @return
 	 */
 	public String importData(List<List<String>> list, JSONObject userInfo);