Merge branch 'dev20230707'

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

@@ -135,7 +135,7 @@
         </div>
         <el-form class="popform" :model="queryParam" ref="ruleForm" label-width="137px" :rules="rules" >
           <el-form-item label="联系人姓名：" class="row" prop="name">
-            <el-input type="text" v-model="queryParam.name" placeholder="请输入"></el-input>
+            <el-input type="text" v-model="queryParam.name" :οnkeyup="queryParam.name=queryParam.name.replace(/^\s+|\s+$/g,'')" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="联系人性别：" class="row">
             <el-radio-group v-model="queryParam.sex">
@@ -226,7 +226,9 @@
         total:0,
         projectname:this.$route.query.projectname,
         companyName:this.customname,
-        queryParam:[],
+        queryParam:{
+          name:'',
+        },
         isDisableds:this.isDisabled,
         isSkeleton:true,
         delid:null,
@@ -279,7 +281,7 @@
           this.isSkeleton = false
           this.tableData = result.code == 200?result.rows:[]
           this.total = result.code == 200?result.total:0
-          console.log(this.tableData)
+          // console.log(this.tableData)
         })
       },
       save(){

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseService.java

@@ -416,7 +416,7 @@ public class EnterpriseService {
                 result.put("companyId", MapUtil.getInt(BeanUtil.beanToMap(map.get("data")), "jskEid"));
             }
             if (!ObjectUtil.isEmpty(result.get("companyId"))) {
-                R res = this.getUipIdByCid(new ArrayList<>(MapUtils.getInteger(result, "companyId")));
+                R res = this.getUipIdByCid(Collections.singletonList(MapUtils.getInteger(result,"companyId")));
                 if (!ObjectUtils.isEmpty(res.getData())) {
                     List<Map<String, Object>> data = (List<Map<String, Object>>) res.getData();
                     result.put("uipId", MapUtil.getStr(BeanUtil.beanToMap(data.get((0))), "uipId"));