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/CustomerInfoServiceImpl.java

@@ -73,10 +73,6 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
                 if(!ObjectUtils.isEmpty(bo.getCustomerName())){
                     item.setCustomerName(StringUtils.markInRed(item.getCustomerName(), bo.getCustomerName()));
                 }
-                //关键字标红
-                if(!ObjectUtils.isEmpty(bo.getLeaderName())){
-                    item.setCustomerName(StringUtils.markInRed(item.getLeaderName(), bo.getLeaderName()));
-                }
                 try {
                     Map<String, Object> map = opportunityRadarService.enterpriseByName(item.getCustomerName());
                     if (!ObjectUtils.isEmpty(map.get("data"))) {
@@ -87,6 +83,10 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
                 }catch (Exception e){
                     log.error("CustomerInfoServiceImpl.queryPageList() error:" + e);
                 }
+                //关键字标红
+                if(!ObjectUtils.isEmpty(bo.getLeaderName())){
+                    item.setCustomerName(StringUtils.markInRed(item.getLeaderName(), bo.getLeaderName()));
+                }
             });
         }
         return TableDataInfo.build(page);

dsk-operate-ui/src/views/detail/groupAccount/component/members.vue

@@ -387,14 +387,14 @@
           }
         }
         if(key === '2'){
+          this.queryParams.maxStockPercent=''
+          // this.paramsData.maxStockPercent=''
           if(name === this.cgblName){
             this.cgblName=''
+            this.queryParams.minStockPercent=''
+            this.queryParams.maxStockPercent=''
           }else {
             this.cgblName=name;
-          }
-          this.queryParams.maxStockPercent=''
-          this.paramsData.maxStockPercent=''
-          if(this.cgblName){
             if(name === '100%'){
               this.queryParams.minStockPercent=1
             }
@@ -411,14 +411,11 @@
               this.queryParams.minStockPercent=0.01
               this.queryParams.maxStockPercent=0.05
             }
-          }else {
-            this.queryParams.minStockPercent=''
-            this.queryParams.maxStockPercent=''
           }
           if(this.paramsData){
-            if(!this.paramsData.combineId){
-              this.paramsData=this.queryParams
-            }
+            // if(!this.paramsData.combineId){
+            this.paramsData=this.queryParams
+            // }
             this.paramsData.pageNum =1
             this.queryParams.pageNum =1
           }