|
@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.free.controller.ChatRecordController;
|
|
import com.free.controller.ChatRecordController;
|
|
import com.free.entity.TransferApply;
|
|
import com.free.entity.TransferApply;
|
|
|
|
+import com.free.entity.User;
|
|
import com.free.entity.system.Customer;
|
|
import com.free.entity.system.Customer;
|
|
import com.free.mapper.TransferApplyMapper;
|
|
import com.free.mapper.TransferApplyMapper;
|
|
import com.free.service.system.CustomerService;
|
|
import com.free.service.system.CustomerService;
|
|
@@ -23,8 +24,8 @@ public class TransferApplyService extends ServiceImpl<TransferApplyMapper, Trans
|
|
private CustomerService customerService;
|
|
private CustomerService customerService;
|
|
@Autowired
|
|
@Autowired
|
|
private ChatRecordService chatRecordService;
|
|
private ChatRecordService chatRecordService;
|
|
-
|
|
|
|
-
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private UserService userService;
|
|
|
|
|
|
// @Autowired
|
|
// @Autowired
|
|
// private UserService userService
|
|
// private UserService userService
|
|
@@ -45,8 +46,14 @@ public class TransferApplyService extends ServiceImpl<TransferApplyMapper, Trans
|
|
map.put("customer_name", cData.getNick_name());
|
|
map.put("customer_name", cData.getNick_name());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- // TODO:查询用户名称
|
|
|
|
- map.put("user_name", "还没有呢");
|
|
|
|
|
|
+ String user_id = i.getUser_id();
|
|
|
|
+ if (null != user_id) {
|
|
|
|
+ User uData = userService.getById(user_id);
|
|
|
|
+ if (null != uData) {
|
|
|
|
+ // 查询用户名称
|
|
|
|
+ map.put("user_name", uData.getName());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
|
|
returnData.add(map);
|
|
returnData.add(map);
|
|
|
|
|