修改根据物料名称与型号查询物料时的查询规则

src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml

@@ -214,6 +214,9 @@
         <if test="version != null and version != ''">
             and version = #{version}
         </if>
+        <if test="version == null or version == ''">
+            and version is null
+        </if>
 
     </select>
 

src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java

@@ -917,7 +917,7 @@ public class ExcelServiceImpl implements ExcelService {
                     Map<String, Object> map = new HashMap<>();
                     map.put("mname", mname);
                     map.put("version", version);
-                    List<Material> materialPByCondition = materialService.findMaterialPByConditionForTable(map);
+                    List<Material> materialPByCondition = materialMapper.findMaterialByMnameAndVersion(map);
                     if (materialPByCondition.size() == 0) {
                         // 如果没有当前物料
                         String s = dataIndex.get(i);