|
@@ -624,12 +624,13 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
|
|
|
List<JSONObject> jian = JsonChangeUtils.toJSONObject(list);
|
|
|
for (JSONObject jsonObject:jian) {
|
|
|
syOrderDataVO = JSONObject.toJavaObject(jsonObject, SyOrderDataVO.class);
|
|
|
- result.add(syOrderDataVO);
|
|
|
+
|
|
|
}
|
|
|
if(syOrderDataVO.getSupplier()==null){
|
|
|
return result;
|
|
|
}
|
|
|
if(!syOrderDataVO.getSupplier().equals("马菲羊")){
|
|
|
+ result.add(syOrderDataVO);
|
|
|
return result;
|
|
|
}
|
|
|
String sql2 = "SELECT quantity," +
|