企业管理-配置信息：修改删除时会删除所有配置项，将添加配置和修改配置弹框设置为点击弹框外不消失

jianshui-admin/src/main/java/com/jianshui/web/controller/system/CompanyservicePropController.java

@@ -3,6 +3,7 @@ package com.jianshui.web.controller.system;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.alibaba.fastjson.JSONObject;
 import com.jianshui.common.core.domain.entity.SysUser;
 import com.jianshui.common.utils.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -100,8 +101,9 @@ public class CompanyservicePropController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:prop:remove')")
     @Log(title = "企业扩展属性，包括大象key等", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{companyids}")
-    public AjaxResult remove(@PathVariable Long[] companyids)
+    public AjaxResult remove(@PathVariable  String[] companyids)
     {
+        logger.info("删除企业扩展属性，包括大象key{}", JSONObject.toJSONString(companyids));
         return toAjax(companyservicePropService.deleteCompanyservicePropByCompanyids(companyids));
     }
 

jianshui-system/src/main/java/com/jianshui/system/mapper/CompanyservicePropMapper.java

@@ -59,7 +59,7 @@ public interface CompanyservicePropMapper {
      * @param companyids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteCompanyservicePropByCompanyids(Long[] companyids);
+    public int deleteCompanyservicePropByCompanyids(String[] companyids);
 
     public CompanyserviceProp selectPropByKey(@Param("companyId") Long companyId, @Param("key") String key);
 

jianshui-system/src/main/java/com/jianshui/system/service/ICompanyservicePropService.java

@@ -50,7 +50,7 @@ public interface ICompanyservicePropService {
      * @param companyids 需要删除的企业扩展属性，包括大象key等主键集合
      * @return 结果
      */
-    public int deleteCompanyservicePropByCompanyids(Long[] companyids);
+    public int deleteCompanyservicePropByCompanyids(String[] companyids);
 
     /**
      * 删除企业扩展属性，包括大象key等信息

jianshui-system/src/main/java/com/jianshui/system/service/impl/CompanyservicePropServiceImpl.java

@@ -79,7 +79,7 @@ public class CompanyservicePropServiceImpl implements ICompanyservicePropService
      * @return 结果
      */
     @Override
-    public int deleteCompanyservicePropByCompanyids(Long[] companyids) {
+    public int deleteCompanyservicePropByCompanyids(String[] companyids) {
         return companyservicePropMapper.deleteCompanyservicePropByCompanyids(companyids);
     }
 

jianshui-system/src/main/resources/mapper/system/CompanyservicePropMapper.xml

@@ -62,7 +62,7 @@
     </delete>
 
     <delete id="deleteCompanyservicePropByCompanyids" parameterType="String">
-        delete from companyservice_prop where companyid in
+        delete from companyservice_prop where concat(companyid,`key`,`value`) in
         <foreach item="companyid" collection="array" open="(" separator="," close=")">
             #{companyid}
         </foreach>

jianshui-ui/src/views/system/companyservice/companyservice_prop/list.vue

@@ -109,7 +109,7 @@
     />
 
     <!-- 添加或修改企业扩展属性，包括大象key等对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="属性" prop="key">
           <el-input v-model="form.key" placeholder="请输入属性"/>
@@ -141,6 +141,8 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      //选中删除key
+      deleteKeys: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -220,6 +222,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.companyid)
+      this.deleteKeys = selection.map(item => item.companyid+item.key+item.value)
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
@@ -267,8 +270,9 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const companyids = row.companyid || this.ids
+      const deleteKey = row.companyid+row.key+row.value || this.deleteKeys
       this.$modal.confirm('是否确认删除企业扩展属性，包括大象key等编号为"' + companyids + '"的数据项？').then(function() {
-        return delProp(companyids)
+        return delProp(deleteKey)
       }).then(() => {
         this.getList()
         this.$modal.msgSuccess('删除成功')