Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/PlanServiceImpl.java

@@ -596,7 +596,8 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
             List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", companyId));
             List<Department> departmentList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id", companyId));
             List<Product> productList = productMapper.selectList(new QueryWrapper<Product>().eq("company_id", companyId));
-            List<ProdProcedure> allProcedureList = prodProcedureMapper.selectList(new QueryWrapper<ProdProcedure>().eq("company_id", companyId).orderByDesc("id"));
+            List<ProdProcedure> allProcedureList = prodProcedureMapper.selectList(new QueryWrapper<ProdProcedure>()
+                    .eq("company_id", companyId).isNotNull("product_id").orderByDesc("id"));
             List<Plan> needInsertList=new ArrayList<>();
             XSSFRow row0 = sheet.getRow(0);
             XSSFCell cell0 = row0.getCell(0);
@@ -949,7 +950,11 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
                 if(lastPlanList.size()>0){
                     saveOrUpdateBatch(lastPlanList);
                 };
-                msg.setData("导入成功,其中产品["+sb.toString()+"]产品工序未完成，请完成工序配置后重新导入");
+                if (sb.toString().isEmpty()){
+                    msg.setData("导入成功");
+                }else {
+                    msg.setData("导入成功,其中产品[" + sb.toString() + "]产品工序未完成，请完成工序配置后重新导入");
+                }
             }
         } catch (IOException e) {
             e.printStackTrace();