ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java

@@ -171,7 +171,7 @@ public class WoPackagingBoxSubstrateController {
         boxQueryWrapper.eq(StringUtils.isNotBlank(packagingBoxId), WoPackagingBox.BOX_NO, packagingBoxId);
         WoPackagingBox box = woPackagingBoxMapper.selectList(boxQueryWrapper).get(0);
 
-        if((substrate.getLineBody()==box.getLineBody()) && (substrate.getPowerLevel()==box.getPowerLevel()) )
+        if((substrate.getLineBody()==box.getLineBody()) && (substrate.getPowerLevel().equals(box.getPowerLevel())) )
         {
             dto.setId(substrate.getId());
             woPackagingBoxSubstrateService.insertSubstrate(dto);

ym-packing/src/main/java/com/cnbm/packing/service/impl/PrintModelServiceBizImpl.java

@@ -40,7 +40,7 @@ public class PrintModelServiceBizImpl extends CrudServiceImpl<PrintModelMapper,
         wrapper.like(StringUtils.isNotBlank(name), PrintModel.NAME, name);
         if(params.get("type")!=null) {
             Integer type = Integer.parseInt(params.get("type").toString());
-            wrapper.eq(ObjectUtils.isNotNull(type), PrintModel.LINE_BODY, type);
+            wrapper.eq(ObjectUtils.isNotNull(type), PrintModel.TYPE, type);
         }
         if(params.get("lineBody")!=null) {
             Integer lineBody = Integer.parseInt(params.get("lineBody").toString());