u

dsk-common/src/main/java/com/dsk/common/utils/StringUtils.java

@@ -7,6 +7,7 @@ import cn.hutool.core.util.StrUtil;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.springframework.util.AntPathMatcher;
+import org.springframework.util.ObjectUtils;
 
 import java.util.*;
 import java.util.function.Function;
@@ -329,6 +330,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
 
     //去除字符串标红
     public static String removeRed(String str) {
+        if(ObjectUtils.isEmpty(str)) return null;
         return str.replace("<font color='#FF204E'>" ,"").replace("</font>","");
     }
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/JskCombineInfoService.java

@@ -177,9 +177,11 @@ public class JskCombineInfoService {
             if(ObjectUtils.isEmpty(dto.getKeys())){
                 vo.setTenderee(MapUtil.getStr(list.get(i),"tenderee"));
                 vo.setProjectName(MapUtil.getStr(list.get(i),"projectName"));
+                vo.setAgency(MapUtil.getStr(list.get(i),"agency"));
             }else {
                 vo.setTenderee(StringUtils.removeRed(MapUtil.getStr(list.get(i),"tenderee")));
                 vo.setProjectName(StringUtils.removeRed(MapUtil.getStr(list.get(i),"projectName")));
+                vo.setAgency(StringUtils.removeRed(MapUtil.getStr(list.get(i),"agency")));
             }
             vo.setStockPercent(MapUtil.getDouble(list.get(i),"stockPercent"));
             vo.setMemberLevel(MapUtil.getStr(list.get(i),"memberLevel"));
@@ -187,7 +189,7 @@ public class JskCombineInfoService {
             vo.setAddress(MapUtil.getStr(list.get(i),"address"));
             vo.setSubjectMatter(MapUtil.getStr(list.get(i),"subjectMatter"));
             vo.setProjectType(MapUtil.getStr(list.get(i),"projectType"));
-            vo.setAgency(MapUtil.getStr(list.get(i),"agency"));
+
             result.add(vo);
         }
         return result;