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

feat: bug-384 用户端需要支持管理端用户添加工单和后续操作 

搜索消息接口优化
This commit is contained in:
曹鹏飞 2025-07-31 17:21:30 +08:00
parent df47016907
commit f2957eb44f
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/MessageController.java
View File

@ -1,5 +1,6 @@
package com.nflg.mobilebroken.admin.controller; package com.nflg.mobilebroken.admin.controller;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.nflg.mobilebroken.admin.annotation.ApiMark; import com.nflg.mobilebroken.admin.annotation.ApiMark;
import com.nflg.mobilebroken.common.constant.Constant; import com.nflg.mobilebroken.common.constant.Constant;
@ -11,6 +12,7 @@ import com.nflg.mobilebroken.common.pojo.vo.AdminMessageVO;
import com.nflg.mobilebroken.common.pojo.vo.MessageConfigVO; import com.nflg.mobilebroken.common.pojo.vo.MessageConfigVO;
import com.nflg.mobilebroken.common.util.AdminUserUtil; import com.nflg.mobilebroken.common.util.AdminUserUtil;
import com.nflg.mobilebroken.common.util.PageUtil; import com.nflg.mobilebroken.common.util.PageUtil;
import com.nflg.mobilebroken.repository.entity.AdminUser;
import com.nflg.mobilebroken.repository.entity.AppUser; import com.nflg.mobilebroken.repository.entity.AppUser;
import com.nflg.mobilebroken.repository.entity.AppUserApplyfor; import com.nflg.mobilebroken.repository.entity.AppUserApplyfor;
import com.nflg.mobilebroken.repository.entity.Ticket; import com.nflg.mobilebroken.repository.entity.Ticket;
@ -67,9 +69,14 @@ public class MessageController extends ControllerBase {
return ApiResult.success(PageUtil.convert(datas, d -> { return ApiResult.success(PageUtil.convert(datas, d -> {
if (Objects.equals(d.getSource(), 0)) { if (Objects.equals(d.getSource(), 0)) {
Ticket ticket = ticketService.getById(d.getSourceId()); Ticket ticket = ticketService.getById(d.getSourceId());
AppUser appUser = appUserService.getById(ticket.getUserId());
d.setSourceCreateTime(ticket.getCreateTime()); d.setSourceCreateTime(ticket.getCreateTime());
if (StrUtil.equals(ticket.getUserPlatform(), Constant.FROM_ADMIN)) {
AdminUser adminUser = adminUserService.getById(ticket.getUserId());
d.setSourceCreateUserName(adminUser.getUserName());
} else {
AppUser appUser = appUserService.getById(ticket.getUserId());
d.setSourceCreateUserName(appUser.getName()); d.setSourceCreateUserName(appUser.getName());
}
} else if (Objects.equals(d.getSource(), 1)) { } else if (Objects.equals(d.getSource(), 1)) {
AppUserApplyfor appUserApplyfor = appUserApplyforService.getById(d.getSourceId()); AppUserApplyfor appUserApplyfor = appUserApplyforService.getById(d.getSourceId());
AppUser appUser = appUserService.getById(appUserApplyfor.getCreateBy()); AppUser appUser = appUserService.getById(appUserApplyfor.getCreateBy());