rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/bug-634' into test

This commit is contained in:
曹鹏飞 2025-08-28 09:55:23 +08:00
parent 58c70d57bc f08e40d051
commit d2c44ed0e2
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java
View File

@ -607,6 +607,13 @@ public class TicketController extends ControllerBase {
List<Integer> handleIds = StrUtil.split(ticket.getHandle(), ",").stream().map(Integer::parseInt).collect(Collectors.toList()); List<Integer> handleIds = StrUtil.split(ticket.getHandle(), ",").stream().map(Integer::parseInt).collect(Collectors.toList());
List<Integer> cqms = adminUserService.getCQMIds(); List<Integer> cqms = adminUserService.getCQMIds();
TBasePart part = partService.getByIdAndLanguage(ticket.getComponentId(), Constant.DEFAULT_LANGUAGE_CODE); TBasePart part = partService.getByIdAndLanguage(ticket.getComponentId(), Constant.DEFAULT_LANGUAGE_CODE);
List<Integer> adminUsers = adminUserService.getTickerMangagers();
if (StrUtil.isNotBlank(ticket.getHandle())) {
adminUsers.addAll(StrUtil.split(ticket.getHandle(), ",").stream().map(Integer::parseInt).collect(Collectors.toList()));
}
if (StrUtil.equals(Constant.FROM_ADMIN, ticket.getUserPlatform())) {
adminUsers.add(ticket.getUserId());
}
TicketInfoVO vo = new TicketInfoVO() TicketInfoVO vo = new TicketInfoVO()
.setId(ticket.getId()) .setId(ticket.getId())
.setNo(ticket.getNo()) .setNo(ticket.getNo())
@ -642,6 +649,7 @@ public class TicketController extends ControllerBase {
.setUserIsHandle(handleIds.contains(AdminUserUtil.getUserId())) .setUserIsHandle(handleIds.contains(AdminUserUtil.getUserId()))
.setUserIsCQM(cqms.contains(AdminUserUtil.getUserId())) .setUserIsCQM(cqms.contains(AdminUserUtil.getUserId()))
.setUserPlatform(ticket.getUserPlatform()) .setUserPlatform(ticket.getUserPlatform())
.setCanSendMessage(adminUsers.contains(AdminUserUtil.getUserId()))
.setEvaluate(getTicketEvaluate(ticket.getId())); .setEvaluate(getTicketEvaluate(ticket.getId()));
return ApiResult.success(vo); return ApiResult.success(vo);
} }

5
nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TicketInfoVO.java
View File

@ -127,4 +127,9 @@ public class TicketInfoVO {
* 当前用户是否为CQM * 当前用户是否为CQM
*/ */
private Boolean userIsCQM; private Boolean userIsCQM;
/**
* 当前用户是否可发送消息
*/
private Boolean canSendMessage;
} }