no message

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/base/WorkerGoodsLogic.java

@@ -76,6 +76,7 @@ public class WorkerGoodsLogic {
         Integer incrId = config.getWorkerGoodsIncrId();
         bean.setGoodsId(null);
         bean.setCompanyWechatId(adminUser.getCompanyWechatId());
+        bean.setCompanyWechatName(adminUser.getCompanyName());
 
         final WebsitGoodsCategory category = websitGoodsCategoryService.getById(bean.getGoodsCategoryId());
 
@@ -112,7 +113,6 @@ public class WorkerGoodsLogic {
     @Transactional(rollbackFor = Exception.class)
     public void edit(WorkerGoodsBean bean) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
-        bean.setCompanyWechatId(adminUser.getCompanyWechatId());
 
         WorkerGoods workerGoods = new WorkerGoods();
         BeanUtils.copyProperties(bean, workerGoods);
@@ -172,26 +172,28 @@ public class WorkerGoodsLogic {
             row.add(exportBean.getWebsitGoodsName());
             row.add(exportBean.getSpecification());
             row.add(exportBean.getGoodsSalesConvertQty());
-            row.add(StringUtils.isNotBlank(exportBean.getManageWorkerStock()) ?BaseEnum.keyToValue(IsYesNoEnum.class, exportBean.getManageWorkerStock()) : "");
-            row.add(StringUtils.isNotBlank(exportBean.getWebsitGoodsStatus()) ?BaseEnum.keyToValue(StateEnum.class, exportBean.getWebsitGoodsStatus()) : "");
+            row.add(StringUtils.isNotBlank(exportBean.getManageWorkerStock()) ? BaseEnum.keyToValue(IsYesNoEnum.class, exportBean.getManageWorkerStock()) : "");
+            row.add(StringUtils.isNotBlank(exportBean.getWebsitGoodsStatus()) ? BaseEnum.keyToValue(StateEnum.class, exportBean.getWebsitGoodsStatus()) : "");
             rows.add(row);
 
             if (entryValue.size() > 1) {
                 for (int i = 1; i < entryValue.size(); i++) {
-                    row.add("");
-                    row.add("");
-                    row.add("");
-                    row.add("");
-                    row.add("");
-                    row.add("");
-                    row.add(exportBean.getWebsitCategoryName());
-                    row.add(exportBean.getWebsitGoodsId());
-                    row.add(exportBean.getWebsitGoodsName());
-                    row.add(exportBean.getSpecification());
-                    row.add(exportBean.getGoodsSalesConvertQty());
-                    row.add(StringUtils.isNotBlank(exportBean.getManageWorkerStock()) ?BaseEnum.keyToValue(IsYesNoEnum.class, exportBean.getManageWorkerStock()) : "");
-                    row.add(StringUtils.isNotBlank(exportBean.getWebsitGoodsStatus()) ?BaseEnum.keyToValue(StateEnum.class, exportBean.getWebsitGoodsStatus()) : "");
-                    rows.add(row);
+                    List<Object> row2 = new ArrayList<>();
+                    final WorkerGoodsRelaExportBean exportBean2 = entryValue.get(i);
+                    row2.add("");
+                    row2.add("");
+                    row2.add("");
+                    row2.add("");
+                    row2.add("");
+                    row2.add("");
+                    row2.add(exportBean2.getWebsitCategoryName());
+                    row2.add(exportBean2.getWebsitGoodsId());
+                    row2.add(exportBean2.getWebsitGoodsName());
+                    row2.add(exportBean2.getSpecification());
+                    row2.add(exportBean2.getGoodsSalesConvertQty());
+                    row2.add(StringUtils.isNotBlank(exportBean2.getManageWorkerStock()) ? BaseEnum.keyToValue(IsYesNoEnum.class, exportBean2.getManageWorkerStock()) : "");
+                    row2.add(StringUtils.isNotBlank(exportBean2.getWebsitGoodsStatus()) ? BaseEnum.keyToValue(StateEnum.class, exportBean2.getWebsitGoodsStatus()) : "");
+                    rows.add(row2);
                 }
             }
         }