修改区域公司

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

@@ -3085,17 +3085,23 @@ 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);
 
-        for (HighOrder order : list) {
-            HighUser user = highUserService.findByUserId(order.getIdentificationCode());
-            order.setTime(DateUtil.date2String(order.getCreateTime() , "MM月dd日 HH:mm"));
-            List<HighChildOrder> childOrder = getChildOrderByOrder(order.getId());
-            order.setGoodsTypeName("购买：" + GoodsType.getNameByType(childOrder.get(0).getGoodsType()));
-            order.setAgentName(user.getName());
+        if (list.size() > 0) {
+            for (HighOrder order : list) {
+                HighUser user = highUserService.findByUserId(order.getIdentificationCode());
+                order.setTime(DateUtil.date2String(order.getCreateTime() , "MM月dd日 HH:mm"));
+                List<HighChildOrder> childOrder = getChildOrderByOrder(order.getId());
+                order.setGoodsTypeName("购买：" + GoodsType.getNameByType(childOrder.get(0).getGoodsType()));
+                if (user != null) {
+                    order.setAgentName(user.getName());
+                } else {
+                    order.setAgentName("暂无推广人");
+                }
+            }
         }
 
         return list;