给商品按条件查询接口增加非空判断

jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java

@@ -342,6 +342,7 @@ public class MaterialController extends BaseController {
                         unit = unitService.getUnit(material.getUnitId());
                         //拼接副单位的比例
                         String commodityUnit = material.getCommodityUnit();
+                        if(StringUtil.isNotEmpty(commodityUnit) && unit!=null) {
                             if(commodityUnit.equals(unit.getBasicUnit())) {
                                 ratioStr = "[基本]";
                             }
@@ -355,6 +356,7 @@ public class MaterialController extends BaseController {
                                 ratioStr = "[" + unit.getRatioThree().stripTrailingZeros().toPlainString() + unit.getBasicUnit() + "]";
                             }
                         }
+                    }
                     item.put("mBarCode", material.getmBarCode());
                     item.put("name", material.getName());
                     item.put("mnemonic", material.getMnemonic());

jshERP-boot/src/main/java/com/jsh/erp/service/UnitService.java

@@ -227,7 +227,7 @@ public class UnitService {
      * @return
      */
     public BigDecimal parseStockByUnit(BigDecimal stock, Unit unitInfo, String materialUnit) {
-        if(stock!=null) {
+        if(stock!=null && unitInfo!=null && StringUtil.isNotEmpty(materialUnit)) {
             if (materialUnit.equals(unitInfo.getOtherUnit()) && unitInfo.getRatio() != null && unitInfo.getRatio().compareTo(BigDecimal.ZERO) != 0) {
                 stock = stock.divide(unitInfo.getRatio(), 2, BigDecimal.ROUND_HALF_UP);
             }