Merge branch 'LeoN' into test

src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashOasBoxController.java

@@ -170,12 +170,12 @@ public class FosterwxCashOasBoxController extends BaseController<FosterwxCashOas
         feild.put(1, "groupId");
         feild.put(2, "mobileGroupId");
         feild.put(3, "type");
-        feild.put(4, "boxType");
-        feild.put(5, "boxLocation");
+        feild.put(4, "boxType|defualt");
+        feild.put(5, "boxLocation|defualt");
         feild.put(6, "ghId");
         feild.put(7, "name");
         feild.put(8, "scope");
-        feild.put(9, "remark");
+        feild.put(9, "remark|defualt");
         List<Map<String, String>> row = new ArrayList<>();
         VoltaHandle<ArrayList<Map<String, String>>> voltaRes = Analysis.analysis(file, feild);
         if (voltaRes.getErr() != null) {

src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxCashOasBoxServiceImpl.java

@@ -163,12 +163,12 @@ public class FosterwxCashOasBoxServiceImpl extends ServiceImpl<FosterwxCashOasBo
             fosterwxCashOasBox.setStationId(stationInfo.getId());
             fosterwxCashOasBox.setGroupId(Integer.parseInt(row.get(i).get("groupId")));
             fosterwxCashOasBox.setType(Integer.parseInt(row.get(i).get("type")));
-            fosterwxCashOasBox.setBoxType(Integer.parseInt(row.get(i).get("boxType")));
-            fosterwxCashOasBox.setBoxLocation(Integer.parseInt(row.get(i).get("boxLocation")));
+            if (row.get(i).get("boxType") != null) fosterwxCashOasBox.setBoxType(Integer.parseInt(row.get(i).get("boxType")));
+            if (row.get(i).get("boxLocation") != null) fosterwxCashOasBox.setBoxLocation(Integer.parseInt(row.get(i).get("boxLocation")));
             fosterwxCashOasBox.setGhId(row.get(i).get("ghId"));
             fosterwxCashOasBox.setName(row.get(i).get("name"));
             fosterwxCashOasBox.setScope(row.get(i).get("scope"));
-            fosterwxCashOasBox.setRemark(row.get(i).get("remark"));
+            if (row.get(i).get("remark") != null) fosterwxCashOasBox.setRemark(row.get(i).get("remark"));
             fosterwxCashOasBox.setCreateAt(LocalDateTime.now());
             fosterwxCashOasBox.setUploadUid(authUser.getId());
             fosterwxCashOasBox.setUpdateAt(LocalDateTime.now());