库存管理

@@ -168,10 +168,10 @@ public class CollectionUtil {
 	 * @param groupKey 多个分组方法
 	 * @param groupKey 多个分组方法
 	 * @return 分组结果
 	 * @return 分组结果
 	 */
 	 */
-	@SuppressWarnings({ "unchecked", "rawtypes" })
+	/*@SuppressWarnings({ "unchecked", "rawtypes" })
 	public static <T, U> Map groupingByMulti(Collection<U> collection, Function<? super U, ?>... groupKey) {
 	public static <T, U> Map groupingByMulti(Collection<U> collection, Function<? super U, ?>... groupKey) {
 		return groupingByMulti(collection.stream(), groupKey);
 		return groupingByMulti(collection.stream(), groupKey);
-	}
+	}*/
 
 
 	/**
 	/**
 	 * 多个条件分组.
 	 * 多个条件分组.
@@ -180,14 +180,14 @@ public class CollectionUtil {
 	 * @param groupKey 多个分组方法
 	 * @param groupKey 多个分组方法
 	 * @return 分组结果
 	 * @return 分组结果
 	 */
 	 */
-	@SuppressWarnings({ "unchecked", "rawtypes" })
+	/*@SuppressWarnings({ "unchecked", "rawtypes" })
 	public static <T, U> Map groupingByMulti(Stream<U> stearm, Function<? super U, ?>... groupKey) {
 	public static <T, U> Map groupingByMulti(Stream<U> stearm, Function<? super U, ?>... groupKey) {
 		Collector c = Collectors.groupingBy(groupKey[groupKey.length - 1]);
 		Collector c = Collectors.groupingBy(groupKey[groupKey.length - 1]);
 		for (int i = groupKey.length - 2; i >= 0; i--) {
 		for (int i = groupKey.length - 2; i >= 0; i--) {
 			c = Collectors.groupingBy(groupKey[i], c);
 			c = Collectors.groupingBy(groupKey[i], c);
 		}
 		}
 		return (Map) stearm.collect(c);
 		return (Map) stearm.collect(c);
-	}
+	}*/
 	
 	
 	/**
 	/**
 	 * 多条件排序
 	 * 多条件排序

@@ -120,6 +120,7 @@
   </select>
   </select>
 
 
   <sql id="skupPageCondition2" >
   <sql id="skupPageCondition2" >
+    1 = 1
     <if test="storagePrice.status != null and storagePrice.status > -1">
     <if test="storagePrice.status != null and storagePrice.status > -1">
       and status = #{storagePrice.status}
       and status = #{storagePrice.status}
     </if>
     </if>
@@ -141,7 +142,7 @@
     select id, skup, product_id, goods_id, storage_id, depot_num, seller_uid, price, status,
     select id, skup, product_id, goods_id, storage_id, depot_num, seller_uid, price, status,
     update_time, create_time
     update_time, create_time
     from storage_price
     from storage_price
-    where where product_id in
+    where product_id in
     <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
     <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
       #{item}
       #{item}
     </foreach> and status = 1
     </foreach> and status = 1