| | |
|---|
| | | |
|---|
| | | Order orderData = orderClient.detail(order.getOrderId()).getData(); |
|---|
| | | |
|---|
| | | if(!order.getTime().equals(orderData.getTime()) || !order.getServerId().equals(orderData.getServerId())){ |
|---|
| | | if(order.getTime()!=null&& order.getServerId()!=null&&(!order.getTime().equals(orderData.getTime()) || !order.getServerId().equals(orderData.getServerId()))){ |
|---|
| | | // 修改sys_change_dispatch 为已改派 |
|---|
| | | dispatchClient.changeReason(order.getOrderId(),""); |
|---|
| | | } |
|---|
| | |
|---|
| | | public R<List<MasterWorker>> map(String cityCode,String name) { |
|---|
| | | |
|---|
| | | LoginUser loginUser = tokenService.getLoginUser(); |
|---|
| | | if (null == loginUser) { |
|---|
| | | return R.loginExpire("登录失效！"); |
|---|
| | | } |
|---|
| | | // if (null == loginUser) { |
|---|
| | | // return R.loginExpire("登录失效！"); |
|---|
| | | // } |
|---|
| | | if (cityCode==null) { |
|---|
| | | if (loginUser.getIsFranchisee()) { |
|---|
| | | if (loginUser!=null&&loginUser.getIsFranchisee()) { |
|---|
| | | cityCode = loginUser.getCityList().get(0); |
|---|
| | | } else { |
|---|
| | | cityCode = "420100"; |
|---|
