From ac70d1f8b737661ad99ebe6eabb5d5e90d9004ac Mon Sep 17 00:00:00 2001
From: cjw <miko20001@163.com>
Date: Mon, 14 Oct 2024 10:53:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/scale/controller/wx/WxMyController.java   | 6 +-----
 .../service/impl/SysEvaluationRecordServiceImpl.java      | 8 ++++++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxMyController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxMyController.java
index dafd1ca..c52a84b 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxMyController.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxMyController.java
@@ -7,8 +7,6 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.file.FileUtils;
-import org.dromara.common.log.annotation.Log;
-import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
@@ -24,7 +22,6 @@ import org.dromara.scale.utils.AsposeUtil;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -110,8 +107,7 @@ public class WxMyController extends BaseController {
     /**
      * 导出量测记录列表
      */
-    @Log(title = "个人量测记录", businessType = BusinessType.EXPORT)
-    @PostMapping("/evaluation/record/export")
+    @GetMapping("/evaluation/record/export")
     public void export(BaseQueryBo bo, HttpServletResponse response) throws Exception {
         Long userId = LoginHelper.getUserId();
         bo.setUserId(userId);
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationRecordServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationRecordServiceImpl.java
index d7a9ca5..db6483b 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationRecordServiceImpl.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationRecordServiceImpl.java
@@ -132,8 +132,12 @@ public class SysEvaluationRecordServiceImpl implements ISysEvaluationRecordServi
 
         SysUserVo user = userMapper.selectVoById(userId);
         wordData.setNickName(user.getNickName());
-        String s = deptService.selectDeptNameByIds(Long.toString(user.getDeptId()));
-        wordData.setDeptName(s);
+        if (user.getDeptId() !=null) {
+            String s = deptService.selectDeptNameByIds(Long.toString(user.getDeptId()));
+            wordData.setDeptName(s);
+        }else{
+            wordData.setDeptName("无");
+        }
         wordData.setSex("0".equals(user.getSex()) ? "男" : "女");
 
         SysScaleVo scale = scaleMapper.selectVoById(scaleId);