From b2fce0dc7dc4ea5dec9792a2bc3ceb9d33d6e07b Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 04 九月 2023 13:59:52 +0800
Subject: [PATCH] 修改后台社区动态加载不出来

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
index e232775..c973642 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
@@ -125,6 +125,8 @@
         if (isNull(convenientMerchantDO)) {
             return R.fail("商家不存在");
         }
+        Long createBy = convenientMerchantDO.getCreatedBy();
+        BeanUtils.copyProperties(convenientMerchantDTO, convenientMerchantDO);
         if (nonNull(merchantDO) && !merchantDO.getId().equals(convenientMerchantDO.getId())) {
             R.fail("该微信手机号:" + mobilePhone + "已被使用!请更换");
         }
@@ -151,10 +153,10 @@
             serviceIds.forEach(serviceId -> {
                 ConvenientServiceCategoryDO convenientServiceCategoryDO = convenientServiceCategoryDAO.selectById(serviceId);
                 convenientServiceCategoryDAO.createMerchantServiceRelation(Snowflake.getId(), merchantId, serviceId,
-                        convenientServiceCategoryDO.getName(), convenientMerchantDTO.getCreatedBy());
+                        convenientServiceCategoryDO.getName(), createBy);
             });
         }
-        BeanUtils.copyProperties(convenientMerchantDTO, convenientMerchantDO);
+
         convenientMerchantDO.setIntroduction(convenientMerchantDTO.getIntroduction());
         this.baseMapper.updateById(convenientMerchantDO);
         return R.ok();

--
Gitblit v1.7.1