Merge remote-tracking branch 'origin/feature-20240104' into feature-20240104

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)

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);
     }
 }

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<CtLeaveMessage> list = ctLeaveMessageService.selectCtLeaveMessageList(ctLeaveMessage);
         List<CtLeaveMessage> 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);
     }
 

flossom-ui/src/views/system/leaveMessage/index.vue

@@ -84,7 +84,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" prop="id" />
       <el-table-column label="来源" align="center" prop="sourceName" />
-      <el-table-column label="用户头像" align="center" prop="userImg" >
+      <el-table-column label="用户头像" align="center" prop="wxUserMember.headimg" >
         <template slot-scope="scope">
           <el-image :src="scope.row.userImg" style="width: 60px;height: 80px" :preview-src-list="[scope.row.userImg]">
             <div slot="placeholder" class="image-slot"><span class="dot"></span>
@@ -92,9 +92,9 @@
           </el-image>
         </template>
       </el-table-column>
-      <el-table-column label="用户昵称" align="center" prop="userName" />
+      <el-table-column label="用户昵称" align="center" prop="wxUserMember.nickname" />
-      <el-table-column label="用户编号" align="center" prop="userNumber" />
+      <el-table-column label="用户编号" align="center" prop="wxUserMember.id" />
-      <el-table-column label="用户手机号码" align="center" prop="userPhone" />
+      <el-table-column label="用户手机号码" align="center" prop="wxUserMember.mobile" />
       <el-table-column label="用户留言" align="center" prop="messageInfo" />
       <el-table-column label="提交时间" align="center" prop="createTime"  width="160">
         <template slot-scope="scope">