From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict
---
zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopAdvertisTypeAction.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopAdvertisTypeAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopAdvertisTypeAction.java
index 3057829..d07aa26 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopAdvertisTypeAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopAdvertisTypeAction.java
@@ -103,6 +103,7 @@
public @ResponseBody
AjaxResult modifyShopAdvertisType(@RequestBody ShopAdvertisType newShopAdvertisType) {
SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
+
if (StringUtils.isNotBlank(newShopAdvertisType.getNodeStyle())) {
String style = newShopAdvertisType.getNodeStyle();
style = style.replaceAll("px", "rpx")
@@ -116,7 +117,7 @@
newShopAdvertisType.setCreateBy(user.getSuName());
newShopAdvertisType.setUpdateBy(user.getSuName());
-
+ newShopAdvertisType.setCompanyId(user.getCompanyId());
shopAdvertisTypeDao.insert(newShopAdvertisType);
} else {
shopAdvertisTypeDao.updateByModel(newShopAdvertisType);
@@ -135,6 +136,7 @@
collect.forEach(ad -> {
ad.setCreateBy(user.getSuName());
ad.setUpdateBy(user.getSuName());
+ ad.setCompanyId(user.getCompanyId());
ad.setTypeId(newShopAdvertisType.getAdtId());
});
--
Gitblit v1.9.1