diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppMessageServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppMessageServiceImpl.java
index 13a0a334..535b7415 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppMessageServiceImpl.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppMessageServiceImpl.java
@@ -1,5 +1,6 @@
package com.nflg.mobilebroken.repository.service.impl;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -7,10 +8,16 @@ import com.nflg.mobilebroken.common.pojo.request.AppMessageSearchRequest;
import com.nflg.mobilebroken.common.pojo.vo.AppMessageVO;
import com.nflg.mobilebroken.repository.entity.AppMessage;
import com.nflg.mobilebroken.repository.mapper.AppMessageMapper;
+import com.nflg.mobilebroken.repository.service.IAdminUserService;
import com.nflg.mobilebroken.repository.service.IAppMessageService;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
*
@@ -23,6 +30,9 @@ import java.util.List;
@Service
public class AppMessageServiceImpl extends ServiceImpl implements IAppMessageService {
+ @Resource
+ private IAdminUserService adminUserService;
+
@Override
public IPage getNotReadMessage(Integer userId, Integer num) {
return baseMapper.getNotReadMessage(userId, num, new Page<>(1, num));
@@ -30,7 +40,24 @@ public class AppMessageServiceImpl extends ServiceImpl search(Integer userId, AppMessageSearchRequest request) {
- return baseMapper.search(userId, request.getTitle(), new Page<>(request.getPage(), request.getPageSize()));
+ IPage datas = baseMapper.search(userId, request.getTitle(), new Page<>(request.getPage(), request.getPageSize()));
+ Map userMap = new HashMap<>();
+ datas.getRecords().forEach(d -> {
+ if (StrUtil.isNotBlank(d.getTicketHandleBy())) {
+ List userIds = StrUtil.split(d.getTicketHandleBy(), ",").stream().map(Integer::parseInt).collect(Collectors.toList());
+ List handers = new ArrayList<>();
+ userIds.forEach(uId -> {
+ String name = userMap.get(uId);
+ if (StrUtil.isBlank(name)) {
+ name = adminUserService.getById(uId).getUserName();
+ userMap.put(uId, name);
+ }
+ handers.add(name);
+ });
+ d.setTicketHandleBy(StrUtil.join(",", handers));
+ }
+ });
+ return datas;
}
@Override
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml
index fccea6a8..e927cd4f 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml
@@ -4,7 +4,7 @@
- AND t.title LIKE CONCAT('%', #{request.title}, '%')
+ AND (t.title LIKE CONCAT('%', #{request.title}, '%') OR t.no LIKE CONCAT('%', #{request.title}, '%'))
AND t.device_no LIKE CONCAT('%', #{request.deviceNo}, '%')