|
|
@@ -62,20 +62,14 @@ public class WorkOrderController {
|
|
|
|
|
|
@GetMapping("/get")
|
|
|
@SaCheckPermission("workOrder:view")
|
|
|
- public Result<SearchResult<WorkOrderView>> getWorkOrderList(String nickname, Integer feedbackNum) {
|
|
|
- long adminId = StpUtil.getLoginIdAsLong();
|
|
|
+ public Result<SearchResult<WorkOrderView>> getWorkOrderList(String nickname, Integer feedbackNum, Long customerServiceId) {
|
|
|
MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
|
|
|
if (feedbackNum != null) {
|
|
|
builder.put("feedback", String.format("wo.account in (select account from work_order group by account having count(*) >= %s)", feedbackNum));
|
|
|
builder.orderBy(WorkOrder::getAccount).asc();
|
|
|
}
|
|
|
- //是不是客服
|
|
|
- CmsUserVO isCustomer = beanSearcher.searchFirst(CmsUserVO.class, MapUtils.builder()
|
|
|
- .field(CmsUserVO::getRoleNames, "客服").op(Operator.Contain)
|
|
|
- .field(CmsUserVO::getId, adminId)
|
|
|
- .build());
|
|
|
- if (isCustomer != null) {
|
|
|
- builder.field(WorkOrderView::getAssignCustomerServiceId, isCustomer.getId());
|
|
|
+ if (customerServiceId != null) {
|
|
|
+ builder.field(WorkOrderView::getAssignCustomerServiceId, customerServiceId);
|
|
|
}
|
|
|
if (StrUtil.isNotBlank(nickname)) {
|
|
|
List<Long> userIds = userMapper.selectListByNickname(nickname);
|