diff --git a/resources/mybatis/index/IndexHomeDetailsMapper.xml b/resources/mybatis/index/IndexHomeDetailsMapper.xml
index 62951f7..ac409fd 100644
--- a/resources/mybatis/index/IndexHomeDetailsMapper.xml
+++ b/resources/mybatis/index/IndexHomeDetailsMapper.xml
@@ -272,6 +272,9 @@
and mat2.`NAME` like concat ('%',#{maType},'%')
+
+ and rs.isCount = #{isCount}
+
GROUP BY rs.typeId
) a WHERE
diff --git a/src/com/bonus/index/controller/IndexHomeDetailsController.java b/src/com/bonus/index/controller/IndexHomeDetailsController.java
index 4d66fda..bd0d24e 100644
--- a/src/com/bonus/index/controller/IndexHomeDetailsController.java
+++ b/src/com/bonus/index/controller/IndexHomeDetailsController.java
@@ -80,6 +80,39 @@ public class IndexHomeDetailsController extends BaseController list = service.getMaTypeDetails(o);
+ if (o != null) {
+ // 过滤数量
+ if (o.getQuantityFilter() != null && o.getQuantityFilter() > 0) {
+ switch (o.getQuantityFilter()) {
+ case 1:
+ list.removeIf(item -> item.getMaTotal() == null || item.getMaTotal() < 1);
+ break;
+ case 2:
+ list.removeIf(item -> item.getStorageNum() == null || item.getStorageNum() < 1);
+ break;
+ case 3:
+ list.removeIf(item -> item.getInuseNum() == null || item.getInuseNum() < 1);
+ break;
+ case 4:
+ list.removeIf(item -> item.getScrapNum() == null || item.getScrapNum() < 1);
+ break;
+ }
+ }
+ }
+ ar.setSucceed("code", "0");
+ ar.setSucceed(list);
+ } catch (Exception e) {
+ logger.error(e.toString(), e);
+ ar.setFailMsg(GlobalConst.DATA_FAIL);
+ }
+ return ar;
+ }
@RequestMapping(value = "getMaChangeInfo", method = RequestMethod.POST)
@ResponseBody