Merge branch 'V20230915' of http://192.168.60.201/root/dsk-operate-sys into V20230915

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

@@ -82,17 +82,18 @@ public class CustomerServiceImpl implements ICustomerService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean add(Customer customer) {
-        dealWithcustomerData(customer);
-        customer.setUipId(enterpriseCommonService.getUipIdByCompanyNameOrCompanyId(customer.getCompanyName(), customer.getCompanyId()));
         Long userId = LoginHelper.getUserId();
-        customer.setCreateId(userId);
-        customer.setUpdateId(userId);
-        customer.setTenantId(LoginHelper.getTenantId());
         //查重
         Customer verifyCustomer = baseMapper.selectByCompanyNameAndUserId(customer.getCompanyName(), userId);
         if (!ObjectUtils.isEmpty(verifyCustomer)) {
             throw new ServiceException("当前客户信息已存在，请勿重复添加！");
         }
+        dealWithcustomerData(customer);
+        customer.setUipId(enterpriseCommonService.getUipIdByCompanyNameOrCompanyId(customer.getCompanyName(), customer.getCompanyId()));
+
+        customer.setCreateId(userId);
+        customer.setUpdateId(userId);
+        customer.setTenantId(LoginHelper.getTenantId());
 
         int i = baseMapper.insert(customer);
         if (i == 0) throw new ServiceException("客户信息添加错误！");

dsk-module/dsk-biz-api/src/main/java/com/dsk/search/service/BusinessOpportunityRadarService.java

 package com.dsk.search.service;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSONObject;
@@ -13,10 +14,12 @@ import com.dsk.common.exception.ServiceException;
 import com.dsk.common.utils.DskOpenApiUtil;
 import com.dsk.common.utils.StringUtils;
 import com.dsk.jsk.domain.vo.ImportantProjectExportVo;
+import com.dsk.jsk.service.EnterpriseService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -37,6 +40,9 @@ public class BusinessOpportunityRadarService {
     @Autowired
     ICustomerService iCustomerService;
 
+    @Autowired
+    private EnterpriseService enterpriseService;
+
     public AjaxResult jskBidNewsPage(JSONObject object) {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/news/page", object);
         return BeanUtil.toBean(map, AjaxResult.class);
@@ -111,14 +117,18 @@ public class BusinessOpportunityRadarService {
                 companyName = companyName.replace("<font color='#FF204E'>", "");
                 companyName = companyName.replace("</font>", "");
             }
-            companyMap.put("claimStatus", 0);
+            companyMap.put("claimStatus", null);
             for (CustomerStatusListVo vo : claimStatusList) {
                 if (companyName.equals(vo.getCompanyName())) {
                     companyMap.put("claimStatus", vo.getStatus());
                 }
             }
+
+            Integer jskEid = MapUtils.getInteger(companyMap, "jskEid");
+            companyMap.put("uipId", enterpriseService.getUipIdByCompanyNameOrCompanyId(companyName, jskEid));
         }
 
+
         return BeanUtil.toBean(map, AjaxResult.class);
     }