mozhe
/
mental-tenant-api
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

This commit is contained in:
cjw 2024-10-14 10:53:43 +08:00
parent 0837cd6264
commit ac70d1f8b7
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxMyController.java
View File

@ -7,8 +7,6 @@ import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.file.FileUtils; 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.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper; 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.http.MediaType;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping; 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.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@ -110,8 +107,7 @@ public class WxMyController extends BaseController {
/** /**
* 导出量测记录列表 * 导出量测记录列表
*/ */
@Log(title = "个人量测记录", businessType = BusinessType.EXPORT) @GetMapping("/evaluation/record/export")
@PostMapping("/evaluation/record/export")
public void export(BaseQueryBo bo, HttpServletResponse response) throws Exception { public void export(BaseQueryBo bo, HttpServletResponse response) throws Exception {
Long userId = LoginHelper.getUserId(); Long userId = LoginHelper.getUserId();
bo.setUserId(userId); bo.setUserId(userId);

8
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationRecordServiceImpl.java
View File

@ -132,8 +132,12 @@ public class SysEvaluationRecordServiceImpl implements ISysEvaluationRecordServi
SysUserVo user = userMapper.selectVoById(userId); SysUserVo user = userMapper.selectVoById(userId);
wordData.setNickName(user.getNickName()); wordData.setNickName(user.getNickName());
String s = deptService.selectDeptNameByIds(Long.toString(user.getDeptId())); if (user.getDeptId() !=null) {
wordData.setDeptName(s); String s = deptService.selectDeptNameByIds(Long.toString(user.getDeptId()));
wordData.setDeptName(s);
}else{
wordData.setDeptName("无");
}
wordData.setSex("0".equals(user.getSex()) ? "男" : "女"); wordData.setSex("0".equals(user.getSex()) ? "男" : "女");
SysScaleVo scale = scaleMapper.selectVoById(scaleId); SysScaleVo scale = scaleMapper.selectVoById(scaleId);