Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/DCustomerServiceImpl.java

@@ -52,10 +52,6 @@ public class DCustomerServiceImpl extends ServiceImpl<DCustomerMapper, DCustomer
                 //项目合作数量
                 item.setProjectCooperationCount(vo.getProjectCooperationCount());
                 showCustomerClass(item);
-                //关键字标红
-                if (!ObjectUtils.isEmpty(bo.getCustomerName())) {
-                    item.setCustomerName(StringUtils.markInRed(item.getCustomerName(), bo.getCustomerName()));
-                }
                 try {
                     Map<String, Object> map = opportunityRadarService.enterpriseByName(item.getCustomerName());
                     if (!ObjectUtils.isEmpty(map.get("data"))) {
@@ -66,6 +62,10 @@ public class DCustomerServiceImpl extends ServiceImpl<DCustomerMapper, DCustomer
                 } catch (Exception e) {
                     //
                 }
+                //关键字标红
+                if (!ObjectUtils.isEmpty(bo.getCustomerName())) {
+                    item.setCustomerName(StringUtils.markInRed(item.getCustomerName(), bo.getCustomerName()));
+                }
             });
         }
         return TableDataInfo.build(page);