修改区域公司

hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java

@@ -3089,7 +3089,7 @@ public class HighOrderServiceImpl implements HighOrderService {
         if (MapUtils.getLong(map , "agentId") != null) {
             criteria.andIdentificationCodeEqualTo(MapUtils.getLong(map , "agentId"));
         } else {
-            criteria.andIdentificationCodeIsNotNull();
+            criteria.andIdentificationCodeIsNotNull().andIdentificationCodeNotEqualTo(60L);
         }
 
         List<HighOrder> list = highOrderMapper.selectByExample(example);
@@ -3102,15 +3102,11 @@ public class HighOrderServiceImpl implements HighOrderService {
                 order.setGoodsTypeName("购买：" + GoodsType.getNameByType(childOrder.get(0).getGoodsType()));
                 if (user != null) {
                     order.setAgentName(user.getName());
-                } else {
-                    if (order.getIdentificationCode() == 60) {
-                        order.setAgentName("贵州汇联通");
                 } else {
                     order.setAgentName("暂无推广人");
                 }
             }
         }
-        }
 
         return list;
     }