Merge branch 'develop' of https://gitlab.dituhui.com/bsh/project/project into develop

project-order/src/main/java/com/dituhui/pea/order/service/impl/DispatchServiceImpl.java

@@ -294,7 +294,7 @@ public class DispatchServiceImpl implements DispatchService {
         OrgTeamEntity byTeamId = orgTeamDao.getByTeamId(orgTeamEngineers.get(0).getTeamId());
         OrgTeamEntity byTeamId = orgTeamDao.getByTeamId(orgTeamEngineers.get(0).getTeamId());
 
 
         for (OrderInfoEntity entity : orders) {
         for (OrderInfoEntity entity : orders) {
-            if (entity.getEngineerCode().equals(engineer.getEngineerCode())) {
+            if (StringUtils.isNotBlank(entity.getEngineerCode()) && entity.getEngineerCode().equals(engineer.getEngineerCode())) {
                 return Result.failed(String.format("订单已指派个技术员[%s], 不必重复指派给同一个技术员", engineer.getName()));
                 return Result.failed(String.format("订单已指派个技术员[%s], 不必重复指派给同一个技术员", engineer.getName()));
             }
             }
             SkillInfoEntity skill = skillInfoDao.getByBrandAndTypeAndSkill(CommonUtil.fixBrand(entity.getBrand()), entity.getType(), entity.getSkill());
             SkillInfoEntity skill = skillInfoDao.getByBrandAndTypeAndSkill(CommonUtil.fixBrand(entity.getBrand()), entity.getType(), entity.getSkill());
@@ -311,7 +311,7 @@ public class DispatchServiceImpl implements DispatchService {
             entity.setOrgClusterId(byTeamId.getClusterId());
             entity.setOrgClusterId(byTeamId.getClusterId());
             orderInfoDao.save(entity);
             orderInfoDao.save(entity);
             //记录流程
             //记录流程
-            commonService.addOrderEvent(entity.getOrderId(), "", "BEAN", "BEAN", OrderEventEnum.reassignment.getEvent(),
+            commonService.addOrderEvent(entity.getOrderId(), "", "PEA", "PEA", OrderEventEnum.reassignment.getEvent(),
                     String.format(OrderEventEnum.reassignment.getMsg(), engineer.getName() + "-" + (ObjectUtil.isNotNull(byTeamId) ? byTeamId.getTeamName() : "")),
                     String.format(OrderEventEnum.reassignment.getMsg(), engineer.getName() + "-" + (ObjectUtil.isNotNull(byTeamId) ? byTeamId.getTeamName() : "")),
                     "", LocalDateTime.now());
                     "", LocalDateTime.now());
         }
         }