From f0ba8ec37a3c35d1b3f470bea17848718f9b1aab Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Sat, 27 Apr 2024 16:34:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=90=E6=96=99=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xz/controller/XzMaterialController.java   | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java
index c3adb2822..e0aec1c82 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java
@@ -79,13 +79,13 @@ public class XzMaterialController {
     public Result<IPage<XzMaterial>> queryPageList(@ApiIgnore @RequestBody Map<String, Object> map) {
         QueryWrapper<XzMaterial> queryWrapper = QueryGenerator.initPageQueryWrapper(XzMaterial.class, map);
         Page<XzMaterial> page = PageUtil.getPage(map);
-        IPage<XzMaterial> pageList = xzMaterialService.page(page, queryWrapper);
         queryWrapper.orderByDesc("entry_time");
+        IPage<XzMaterial> pageList = xzMaterialService.page(page, queryWrapper);
         if (pageList.getRecords().size() > 0) {
             List<EnterpriseInfo> enterpriseInfos = enterpriseInfoService.listByIds(pageList.getRecords().stream().map(r -> r.getEnterpriseId()).collect(Collectors.toSet()));
             for (XzMaterial record : pageList.getRecords()) {
                 for (EnterpriseInfo enterpriseInfo : enterpriseInfos) {
-                    if (record.getEnterpriseId().equals(enterpriseInfo.getId())) {
+                    if (record.getEnterpriseId().equals(enterpriseInfo.getId().toString())) {
                         record.setEnterpriseName(enterpriseInfo.getEnterpriseName());
                     }
                 }
@@ -133,22 +133,25 @@ public class XzMaterialController {
     @ApiOperation(value = " 添加材料批次信息信息", notes = "添加材料批次信息信息", httpMethod = "POST")
     @PostMapping(value = "/save")
     public Result<Object> save(@RequestBody JSONObject obj) {
+        log.info("添加材料信息" + JSON.toJSONString(obj));
         XzMaterial xzMaterial = new XzMaterial();
         String [] param = {"name", "model", "specifications", "unit", "num", "remark"};
         List<XzMaterialDetail> list = new ArrayList<>();
         xzMaterial.setName(obj.getString("name"));
         xzMaterial.setEntryTime(obj.getDate("entryTime"));
         JSONArray detail = obj.getJSONArray("detail");
-        for (int i = 0; i < detail.size(); i++) {
-            JSONObject detailObj = new JSONObject();
-            JSONObject j = detail.getJSONObject(i);
-            int k = 0;
-            for (String s : j.keySet()) {
-                detailObj.put(param[k], j.get(s));
-                k++;
+        if (detail != null) {
+            for (int i = 0; i < detail.size(); i++) {
+                JSONObject detailObj = new JSONObject();
+                JSONObject j = detail.getJSONObject(i);
+                int k = 0;
+                for (String s : j.keySet()) {
+                    detailObj.put(param[k], j.get(s));
+                    k++;
+                }
+                detailObj.put("projectSn", obj.getString("projectSn"));
+                list.add(JSONObject.parseObject(JSON.toJSONString(detailObj), XzMaterialDetail.class));
             }
-            detailObj.put("projectSn", obj.getString("projectSn"));
-            list.add(JSONObject.parseObject(JSON.toJSONString(detailObj), XzMaterialDetail.class));
         }
         xzMaterial.setProjectSn(obj.getString("projectSn"));
         List<String> enterpriseIds = (List<String>) obj.get("enterpriseId");