ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into dev

Browse Source
This commit is contained in:
furongxin 2024-05-27 17:39:43 +08:00
commit befcf23e50
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/LogInstanceController.java
View File

@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.system.controller.admin.worklog;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptRespVO;
@ -151,6 +152,7 @@ public class LogInstanceController {
@Operation(summary = "获得可查看日志的用户详情")
@Parameter(name = "logId", description = "日志编号", required = true, example = "10")
@PreAuthorize("@ss.hasPermission('system:view-log:query')")
@DataPermission(enable = false)
public CommonResult<List<Map<String, Object>>> getUserByLogId(@RequestParam("logId") Long logId) {
List<Map<String, Object>> readUserVO = new ArrayList<>();

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/comment/WorkLogCommentController.java
View File

@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.system.controller.app.comment;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
import cn.iocoder.yudao.module.system.controller.app.comment.dto.CommentDTO;
import cn.iocoder.yudao.module.system.controller.app.comment.vo.CommentPageListVO;
import cn.iocoder.yudao.module.system.controller.app.comment.vo.CommentTypeCountVO;
@ -27,6 +28,7 @@ public class WorkLogCommentController {
@Operation(summary = "用户工作日志评论-分页查询评论列表")
@GetMapping(value = "/queryCommentPageList")
@DataPermission(enable = false)
public CommonResult<IPage<CommentPageListVO>> queryCommentPageList(CommentDTO dto,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {

14
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/comment/WorkLogCommentServiceImpl.java
View File

@ -162,10 +162,17 @@ public class WorkLogCommentServiceImpl implements WorkLogCommentService {
//获得日志详情
LogInstanceRespVO instanceDO = logInstanceService.getLogInstance(workLogComment.getWorkLogId());
//获得 用户信息Map
Map<Long, AdminUserDO> userMap = userService.getUserMap(Arrays.asList(instanceDO.getStartUserId(), workLogComment.getUserId()));
//获得 userMap
Map<Long, AdminUserDO> userMap = userService.getUserMap(Arrays.asList(instanceDO.getStartUserId(), workLogComment.getCommentUserId(), workLogComment.getUserId()));
String openId = userMap.get(instanceDO.getStartUserId()).getOpenId();
String openId = null;
if (instanceDO.getType() == 0) {
openId = userMap.get(instanceDO.getStartUserId()).getOpenId();
} else if (instanceDO.getType() == 1) {
openId = userMap.get(workLogComment.getCommentUserId()).getOpenId();
}
if (openId != null) {
@ -174,6 +181,5 @@ public class WorkLogCommentServiceImpl implements WorkLogCommentService {
openId, workLogComment, userMap.get(workLogComment.getUserId()).getNickname(),
"formal"));
}
}
}