wangyuanbo hace 2 años
padre
commit
b84c0fa149

+ 0 - 2
imcs-bt-be/imcs-authority-server/src/main/java/com/github/zuihou/api/AndroidApi.java

@@ -155,8 +155,6 @@ public class AndroidApi {
         } else {
             token = (String) accessToken;
         }
-        if (token == "") {
-        }
 
 
         String qrCode = goodsService.getQrCode(response, token, preOrder.getId());

+ 5 - 3
imcs-bt-be/imcs-business-biz/src/main/java/com/github/zuihou/business/barrel/service/impl/EquBarrelServiceImpl.java

@@ -64,16 +64,18 @@ public class EquBarrelServiceImpl extends SuperServiceImpl<EquBarrelMapper, EquB
 
 //        查询该设备上的所有商品
         List<EquGoodsDto> equGoodsDtoList = productionTenantResourceService.getEquGoods(equId);
+        System.out.println("查询到的设备上的商品" + JSON.toJSONString(equGoodsDtoList));
+
+        if (equGoodsDtoList != null && equGoodsDtoList.size() > 0) {
 
-        if (equGoodsDtoList != null&&equGoodsDtoList.size()>0) {
             equGoodsDtoList.forEach(equGoodsDto -> {
                 List<Spe> speList = equGoodsDto.getSpeList();
-                if (null != speList&&speList.size()>0) {
+                if (null != speList && speList.size() > 0) {
                     speList.forEach(spe -> {
                         QueryWrap<Formula> formulaQueryWrap = new QueryWrap<>();
                         formulaQueryWrap.eq("formula_spe_id", spe.getId());
                         List<Formula> formulaList = formulaService.list(formulaQueryWrap);
-                        if (formulaList != null&&formulaList.size()>0) {
+                        if (formulaList != null && formulaList.size() > 0) {
                             if (barrelList != null) {
                                 List<Long> mtList = barrelList.stream().map(EquBarrel::getMtrId).collect(toList());
                                 formulaList.forEach(formula -> {