提交待客录单通过当前用户id查询不到角色报错的bug

添加订单任务的转发和收回操作的bug

src/main/java/com/ydtech/modules/order/service/impl/OrderTaskPoolsServiceImpl.java

@@ -172,8 +172,9 @@ public class OrderTaskPoolsServiceImpl extends BaseController implements OrderTa
         }
         //查询最新数据的
         InsOrderSetUserHis one = insOrderSetUserHisService.getOneBySubOrderId(taskForwardingVo.getSubOrderId());
-        if(one!=null && !one.getNewOperatorId().equals(sysUser.getId())){
-            throw  new SystemException("该订单已经转发给"+one.getNewOperatorName());
+        //有历史任务且子订单的转发人不为空的情况
+        if(one!=null && StringUtils.hasLength(insAreaCompany.getNewOperatorId())){
+            throw  new SystemException("该订单已经转发给"+insAreaCompany.getNewOperatorName());
         }
         //插入轨迹表
         InsOrderSetUserHis  his=new InsOrderSetUserHis(insOrders.getOrderno(), insOrders.getQuoteno(), sysUser.getId(), taskForwardingVo.getAuditId(), new Date(), sysUser.getId(),taskForwardingVo.getSubOrderId(),sysUserNew.getName()+"转发给"+sysUser.getName()+"的任务",sysUser.getName(),sysUserNew.getName());
@@ -209,10 +210,12 @@ public class OrderTaskPoolsServiceImpl extends BaseController implements OrderTa
         }
         //查询最新数据的
         InsOrderSetUserHis one = insOrderSetUserHisService.getOneBySubOrderId(taskForwardingVo.getSubOrderId());
+        //判断没有历史记录
         if(one==null){
             throw  new SystemException("该订单没有做转发操作无法收回");
-        }else if(one!=null && !one.getOldOperatorId().equals(sysUser.getId())){
-            throw  new SystemException("该订单的回收人为"+one.getOldOperatorName());
+            //有历史记录且子订单表中的操作人不为空 且旧的操作人等于当前登陆人才可以收回
+        }else if(one!=null && StringUtils.hasLength(insAreaCompany.getOperatorId()) && !sysUser.getId().equals(insAreaCompany.getOperatorId())){
+            throw  new SystemException("该订单的收回人为"+insAreaCompany.getOperatorName());
         }
         //插入轨迹表
         InsOrderSetUserHis  his=new InsOrderSetUserHis(insOrders.getOrderno(), insOrders.getQuoteno(), one.getNewOperatorId(), one.getOldOperatorId(), new Date(), sysUser.getId(),taskForwardingVo.getSubOrderId(),one.getOldOperatorName()+"回收"+one.getNewOperatorName()+"任务",one.getOldOperatorName(),one.getNewOperatorName());

src/main/java/com/ydtech/modules/protocol/service/impl/TaxSourceServiceImpl.java

@@ -191,7 +191,7 @@ public class TaxSourceServiceImpl extends ServiceImpl<TaxSourceMapper, TaxSource
         // 领导标志
         SysUserRole userRole = sysUserRoleService.selectByUserId(userId);
 
-        if (Arrays.asList(SystemConstant.getSysRoleTeamLeader()).contains(userRole.getRoleId().toString()) && !RoleConstants.R21.getCode().equals(userRole.getRoleId().toString())) { //团队长可查询下面所有人员订单
+        if (userRole!=null && Arrays.asList(SystemConstant.getSysRoleTeamLeader()).contains(userRole.getRoleId().toString()) && !RoleConstants.R21.getCode().equals(userRole.getRoleId().toString())) { //团队长可查询下面所有人员订单
             deptId = null;
         }