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

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

@@ -268,12 +268,16 @@
         }
       })
       creditLevel().then(res=>{
+        let data=[]
         for(let i=0; i<res.data.length; i++){
           if(res.data[i].creditLevel){
-            this.creditLevel.push(res.data[i])
+            data.push(res.data[i])
           }
         }
-        this.initChart1(this.creditLevel)
+        this.creditLevel=data;
+        if(this.creditLevel.length > 0){
+          this.initChart1(this.creditLevel)
+        }
       })
     },
     getFollowList(){

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

@@ -191,7 +191,7 @@
                 <div class="list-content">
                   <p class="list-content-text">
                     <span>中标企业：</span>
-                    <span @click="getUipIdByCid(item.jskEid)" class="a-link companyName">{{item.ename}}</span>
+                    <span @click="getUipIdByCid(item.jskEid)" class="a-link">{{item.ename}}</span>
                   </p>
                   <p class="list-content-text">
                     <span>中标金额：</span>
@@ -1732,23 +1732,6 @@ export default {
                 align-items: center;
                 margin-right: 32px;
                 font-size: 14px;
-
-                span:first-child {
-                  font-weight: 400;
-                  color: rgba(35, 35, 35, 0.4);
-                  line-height: 15px
-                }
-                span:last-child {
-                  font-weight: 400;
-                  color: rgba(35, 35, 35, 0.8);
-                  line-height: 15px
-                }
-                .blue {
-                  color: #0081FF !important;
-                  cursor: pointer;
-
-                }
-
               }
             }
 

dsk-system/src/main/resources/mapper/system/customer/CustomerMapper.xml

@@ -129,7 +129,7 @@
 		    	ct.credit_level creditLevel, count(ct.customer_id) customerCount
 		    from customer ct
             join customer_user ctu on ct.customer_id = ctu.customer_id
-		    where ctu.user_id = #{userId} and ct.credit_level is not null
+		    where ctu.status = 0 and ctu.user_id = #{userId} and ct.credit_level is not null
 		    group by ct.credit_level
         ) ct
         left join sys_dict_data sdd on (sdd.dict_label = ct.creditLevel and sdd.dict_type = 'credit_level_type')