客户修改

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/ProductServiceImpl.java

@@ -289,8 +289,21 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
                 Product product=new Product();
                 product.setCompanyId(companyId);
                 product.setCreatorId(user.getId());
+                JSONArray objects=new JSONArray();
+                for (int i = 0; i < configObJSONArray.size(); i++) {
+                    JSONObject jsonObject = configObJSONArray.getJSONObject(i);
+                    if(jsonObject.getString("type").equals("grid")){
+                        JSONArray columns = jsonObject.getJSONArray("columns");
+                        for (int i1 = 0; i1 < columns.size(); i1++) {
+                            JSONObject jsonObject1 = columns.getJSONObject(i1).getJSONArray("list").getJSONObject(0);
+                            objects.add(jsonObject1);
+                        }
+                    }else {
+                        objects.add(jsonObject);
+                    }
+                }
                 for (int i = 0; i < cellNum; i++) {
-                    JSONObject item = configObJSONArray.getJSONObject(i);
+                    JSONObject item = objects.getJSONObject(i);
                     String modelName = item.getString("model");
                     String className = modelName.substring(0, 1).toUpperCase() + modelName.substring(1);
                     String getter="get"+className;

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/SalesOrderServiceImpl.java

@@ -408,8 +408,21 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
                 SalesOrder order=new SalesOrder();
                 order.setCompanyId(companyId);
                 order.setCreatorId(user.getId());
+                JSONArray objects=new JSONArray();
+                for (int i = 0; i < configObJSONArray.size(); i++) {
+                    JSONObject jsonObject = configObJSONArray.getJSONObject(i);
+                    if(jsonObject.getString("type").equals("grid")){
+                        JSONArray columns = jsonObject.getJSONArray("columns");
+                        for (int i1 = 0; i1 < columns.size(); i1++) {
+                            JSONObject jsonObject1 = columns.getJSONObject(i1).getJSONArray("list").getJSONObject(0);
+                            objects.add(jsonObject1);
+                        }
+                    }else {
+                        objects.add(jsonObject);
+                    }
+                }
                 for (int i = 0; i < cellNum; i++) {
-                    JSONObject item = configObJSONArray.getJSONObject(i);
+                    JSONObject item = objects.getJSONObject(i);
                     String modelName = item.getString("model");
                     String className = modelName.substring(0, 1).toUpperCase() + modelName.substring(1);
                     String getter="get"+className;