From d3df813ed382bd9cd593580a10fe5567581f6880 Mon Sep 17 00:00:00 2001 From: elliott <382696293@qq.com> Date: Fri, 12 Jan 2024 18:04:50 +0800 Subject: [PATCH] =?UTF-8?q?bug=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/domain/entity/CtLeaveMessage.java | 10 ++++++++++ .../service/impl/CtleaveMessageServiceImpl.java | 3 +++ .../system/controller/CtLeaveMessageController.java | 11 +++++++++++ flossom-ui/src/views/system/leaveMessage/index.vue | 8 ++++---- 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/CtLeaveMessage.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/CtLeaveMessage.java index 2122aca..b8cbe59 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/CtLeaveMessage.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/CtLeaveMessage.java @@ -60,6 +60,8 @@ public class CtLeaveMessage extends BaseEntity /** 查询电话处理 */ private String userNumberStr; + private WxUserMember wxUserMember; + public Long getUserId() { return userId; } @@ -164,6 +166,14 @@ public class CtLeaveMessage extends BaseEntity this.userNumberStr = userNumberStr; } + public WxUserMember getWxUserMember() { + return wxUserMember; + } + + public void setWxUserMember(WxUserMember wxUserMember) { + this.wxUserMember = wxUserMember; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/CtleaveMessageServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/CtleaveMessageServiceImpl.java index 8b7bf1a..5c7dc50 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/CtleaveMessageServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/CtleaveMessageServiceImpl.java @@ -56,6 +56,9 @@ public class CtleaveMessageServiceImpl implements ICtleaveMeassageService { CtLeaveMessageEnum ctLeaveMessageEnum = CtLeaveMessageEnum.fromString(ctLeaveMessage.getSource()); ctLeaveMessage.setSourceName(ctLeaveMessageEnum.getRemark()); ctLeaveMessage.setCreateTime(new Date()); + ctLeaveMessage.setUserId(SecurityUtils.getLoginUser().getWxUserMember().getId()); + ctLeaveMessage.setUserImg(SecurityUtils.getLoginUser().getWxUserMember().getHeadimg()); + ctLeaveMessage.setUserName(SecurityUtils.getLoginUser().getWxUserMember().getNickname()); return ctLeaveMessageMapper.insertCtLeaveMessage(ctLeaveMessage); } } diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/CtLeaveMessageController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/CtLeaveMessageController.java index a7b7d28..efdc68e 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/CtLeaveMessageController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/CtLeaveMessageController.java @@ -2,9 +2,11 @@ package com.flossom.system.controller; import java.util.List; import java.io.IOException; +import java.util.Objects; import javax.servlet.http.HttpServletResponse; import com.flossom.common.core.domain.entity.CtLeaveMessage; +import com.flossom.common.core.domain.entity.WxUserMember; import com.flossom.common.core.utils.poi.ExcelUtil; import com.flossom.common.core.web.controller.BaseController; import com.flossom.common.core.web.domain.AjaxResult; @@ -12,6 +14,7 @@ import com.flossom.common.core.web.page.TableDataInfo; import com.flossom.common.log.annotation.Log; import com.flossom.common.log.enums.BusinessType; import com.flossom.common.security.annotation.RequiresPermissions; +import com.flossom.system.service.IWxUserMemberService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -34,6 +37,8 @@ public class CtLeaveMessageController extends BaseController { @Autowired private ICtLeaveMessageService ctLeaveMessageService; + @Autowired + private IWxUserMemberService wxUserMemberService; /** * 查询共创管理-留言管理列表 @@ -45,6 +50,12 @@ public class CtLeaveMessageController extends BaseController startPage(); // List list = ctLeaveMessageService.selectCtLeaveMessageList(ctLeaveMessage); List list = ctLeaveMessageService.selectCtLeaveMessageByCondition(ctLeaveMessage); + for (CtLeaveMessage leaveMessage: list) { + if (Objects.nonNull(leaveMessage.getUserId())) { + WxUserMember userMember = wxUserMemberService.selectWxUserMemberByIdInit(leaveMessage.getUserId()); + leaveMessage.setWxUserMember(userMember); + } + } return getDataTable(list); } diff --git a/flossom-ui/src/views/system/leaveMessage/index.vue b/flossom-ui/src/views/system/leaveMessage/index.vue index dcf4f57..f7c9a66 100644 --- a/flossom-ui/src/views/system/leaveMessage/index.vue +++ b/flossom-ui/src/views/system/leaveMessage/index.vue @@ -84,7 +84,7 @@ - + - - - + + +