zrj
2024-11-05 b8f2c19b869986efa519f1846b63b11378147861
src/main/java/org/springblade/modules/yw/service/impl/EmergencySuppliesServiceImpl.java
@@ -124,9 +124,11 @@
    */
   private void setSupplies(EmergencySuppliesExcel emergencySuppliesExcel, EmergencySuppliesEntity emergencySuppliesEntity) {
      QueryWrapper<SuppliesEntity> wrapper = new QueryWrapper<>();
      wrapper.eq("firm_id",emergencySuppliesEntity.getFirmId())
         .eq("name",emergencySuppliesExcel.getSuppliesName())
      wrapper.eq("name",emergencySuppliesExcel.getSuppliesName())
         .eq("is_deleted",0);
      if (!emergencySuppliesExcel.getSuppliesName().contains("园区")){
         wrapper.eq("firm_id",emergencySuppliesEntity.getFirmId());
      }
      SuppliesEntity suppliesEntity = suppliesService.getOne(wrapper);
      if (null!=suppliesEntity){
         emergencySuppliesEntity.setSuppliesId(suppliesEntity.getId());