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

dsk-operate-ui/src/views/custom/customList/index.vue

@@ -46,7 +46,7 @@
               width="316">
             <template slot-scope="scope">
               <div class="ps1">
-                <div class="wordprimary ps2" @click="toDetail(scope.row,'')" v-html="scope.row.companyName"></div>
+                <div class="wordprimary ps2" @click="toDetail(scope.row,'business')" v-html="scope.row.companyName"></div>
                 <div class="ps3">
                   <el-tooltip class="item" effect="dark" content="写跟进" placement="top" transition="" :open-delay="450">
                     <div  @click="toDetail(scope.row,'gjjl')"><img class="i" src="@/assets/images/project/edit_1.png"><img class="o" src="@/assets/images/project/edit_11.png"></div>
@@ -390,9 +390,9 @@
       let customerId = row.customerId
       let companyId = row.companyId
       let path = type
-      if(type == "" && companyId == null){
-        path = 'business'
-      }
+      // if(type == "" && companyId == null){
+      //   path = 'business'
+      // }
       this.$router.push({path:'/enterprise/'+encodeStr(companyId),query:{customerId:customerId,path:path}})
     },
     clearname(value){

dsk-operate-ui/src/views/custom/historicalCustomers/index.vue

@@ -38,7 +38,7 @@
               width="316">
             <template slot-scope="scope">
               <div class="ps1">
-                <div class="wordprimary ps2" @click="toDetail(scope.row,'')" v-html="scope.row.companyName"></div>
+                <div class="wordprimary ps2" @click="toDetail(scope.row,'business')" v-html="scope.row.companyName"></div>
                 <div class="ps3">
                   <el-tooltip class="item" effect="dark" content="重新认领" placement="top">
                     <div  @click="toRL(scope.row)"><img class="i" src="@/assets/images/project/khrl1.png"><img class="o" src="@/assets/images/project/khrl2.png"></div>
@@ -308,9 +308,9 @@ export default {
       let customerId = row.customerId
       let companyId = row.companyId
       let path = type
-      if(type == "" && companyId == null){
-        path = 'business'
-      }
+      // if(type == "" && companyId == null){
+      //   path = 'business'
+      // }
       this.$router.push({path:'/enterprise/'+encodeStr(companyId),query:{customerId:customerId,path:path}})
     },
     //认领客户

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

@@ -52,8 +52,8 @@ public class UrbanInvestmentPlatformServiceImpl implements UrbanInvestmentPlatfo
         for (Object dataMap : list) {
             String name = MapUtils.getString(CommonUtils.assertAsMap(dataMap), "companyName");
             if (ObjectUtil.isNotEmpty(name) && ObjectUtil.isNotEmpty(pageDto.getKeyword())) {
-                name = name.replace("<font color='red'>","");
-                name = name.replace("</font>","");
+                name = name.replaceAll("<font color='red'>","");
+                name = name.replaceAll("</font>","");
                 companyNames.add(name);
             } else {
                 companyNames.add(name);
@@ -82,8 +82,8 @@ public class UrbanInvestmentPlatformServiceImpl implements UrbanInvestmentPlatfo
             String uipId = MapUtils.getString(companyMap, "uipId");
             String companyName = MapUtils.getString(companyMap, "companyName", "");
             if (ObjectUtil.isNotEmpty(companyName) && ObjectUtil.isNotEmpty(pageDto.getKeyword())) {
-                companyName = companyName.replace("<font color='red'>","");
-                companyName = companyName.replace("</font>","");
+                companyName = companyName.replaceAll("<font color='red'>","");
+                companyName = companyName.replaceAll("</font>","");
             }
             companyMap.put("claimStatus", null);
             companyMap.put("bratingSubjectLevel", null);