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

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.constant.CacheConstants;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.domain.R;
@@ -99,12 +100,12 @@ public class JskCombineInfoService {
     }
 
     public AjaxResult centralEnterprse() {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/centralEnterprse", null);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/centralEnterprse", new JSONObject());
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     public AjaxResult centralEnterprseChild() {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/centralEnterprse/child", null);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/centralEnterprse/child", new JSONObject());
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
@@ -124,7 +125,7 @@ public class JskCombineInfoService {
     }
 
     public AjaxResult centralEnterprseSocial() {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/centralEnterprse/social", null);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/centralEnterprse/social", new JSONObject());
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 

dsk-operate-ui/src/views/project/projectList/component/addProject.vue

@@ -15,7 +15,7 @@
       <el-form-item label="项目名称：" class="row"  prop="projectName">
         <el-input type="text" placeholder="请输入" v-model="queryParam.projectName" @input="getProject(1)" :οnkeyup="queryParam.projectName=queryParam.projectName.replace(/^\s+|\s+$/g,'')"></el-input>
         <div class="resultlist infinite-list" v-infinite-scroll="load1" v-if="proList.length>0" id="box1">
-          <div class="infinite-list-item" v-for="(item,index) in proList" @click="selProject(item)"><span  v-html="item.projectName" :key="projectpage"></span></div>
+          <div class="infinite-list-item" v-for="(item,index) in proList" @click="selProject(item)"><span  v-html="item.projectName" :key="projectpage+index"></span></div>
         </div>
       </el-form-item>
       <el-form-item label="招采单位：" class="row"  prop="ownerCompany">

dsk-operate-ui/src/views/system/user/profile/index.vue

@@ -139,7 +139,6 @@ export default {
           this.tableData = []
           this.tableDataTotal = 0
         }
-        this.tableDataTotal = 0
         this.isSkeleton = false
       })
     },