Merge remote-tracking branch 'origin/dev20230707'

dsk-system/src/main/java/com/dsk/system/service/impl/CustomerServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.dsk.common.annotation.DataScope;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.exception.ServiceException;
 import com.dsk.common.utils.SecurityUtils;
@@ -27,6 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -52,6 +54,7 @@ public class CustomerServiceImpl implements ICustomerService {
     private BusinessOpportunityRadarService opportunityRadarService;
 
     @Override
+//    @DataScope(deptAlias = "d", userAlias = "u")
     public List<CustomerListVo> selectList(CustomerSearchDto dto) {
         dto.setUserId(SecurityUtils.getUserId());
         dto.setStatus(ObjectUtils.isEmpty(dto.getStatus()) ? 0 : dto.getStatus());
@@ -74,10 +77,19 @@ public class CustomerServiceImpl implements ICustomerService {
         dealWithcustomerData(customer);
         if (ObjectUtils.isEmpty(customer.getUipId())) {
             try {
-                R res = enterpriseService.getUipId(customer.getCompanyName());
+                List<Integer> list=new ArrayList<>();
+                list.add(customer.getCompanyId());
+                R res = enterpriseService.getUipIdByCid(list);
+                if (!ObjectUtils.isEmpty(res.getData())){
+                    List<Map<String,Object>> data = (List<Map<String, Object>>) res.getData();
+                    customer.setUipId(MapUtil.getStr(BeanUtil.beanToMap(data.get((0))), "uipId"));
+                }
+                if(ObjectUtils.isEmpty(customer.getUipId())){
+                    res = enterpriseService.getUipId(customer.getCompanyName());
                     if (!ObjectUtils.isEmpty(res.getData())) {
                         customer.setUipId(MapUtil.getStr(BeanUtil.beanToMap(res.getData()), "uipId"));
                     }
+                }
             } catch (Exception e) {
                 log.error("获取城投平台企业id错误！error：{}", e.getMessage());
             }