diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
index e1e9641f..97de49f4 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
@@ -829,6 +829,15 @@ public class MaterialServiceImpl implements MaterialService {
                 }
             }
             List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(m.getMid());
+            if(splitInfoByMid == null){
+                splitInfoByMid = new ArrayList<>();
+            }
+
+            Map<String,Object> paramByBarcode = new HashMap<>();
+            paramByBarcode.put("mcode", m.getCode());
+            paramByBarcode.put("codeFlag", 1);
+            List<MaterialAndBarCode> materialByBarCodeByCondition = materialMapper.findMaterialByBarCodeByCondition(paramByBarcode);
+            m.setMaterialAndBarCodeList(materialByBarCodeByCondition);
             m.setSplitInfoList(splitInfoByMid);
             MaterialType materialTypeByOldId = materialTypeMapper.findMaterialTypeByOldId(material.getMaterialTypeId());
             m.setTypeName(materialTypeByOldId.getTname());
diff --git a/src/main/resources/templates/pages/group/group-add_back.html b/src/main/resources/templates/pages/group/group-add_back.html
index 0f356f50..75420577 100644
--- a/src/main/resources/templates/pages/group/group-add_back.html
+++ b/src/main/resources/templates/pages/group/group-add_back.html
@@ -608,7 +608,7 @@
                                 var idNumber = materialId.name.split("mid")[1];
                                 var unit = $("#unit" + idNumber);
                                 unit.empty();
-                                $("#unit" + idNumber).append(new Option(material.baseUnit, "-1"));
+                                $("#unit" + idNumber).append(new Option(material.unit, "-1"));
                                 var unitList = material["splitInfoList"];
                                 for (let i = 0; i < unitList.length; i++) {
                                     $("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
@@ -772,7 +772,7 @@
                             unit.empty();
                             $("#unit" + idNumber).append(new Option(material.baseUnit, "-1"));
                             var unitList = material["splitInfoList"];
-                            if (unitList !== null && unitList != undefined) {
+                            if (unitList !== null && unitList !== undefined) {
                                 for (let i = 0; i < unitList.length; i++) {
                                     $("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
                                 }