From 24eaf74e019c66237b9ea537d03cda4ff07ec477 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Wed, 21 Feb 2024 10:50:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=86-=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=BF=A1=E6=81=AF=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=97=B6=E4=BC=9A=E5=88=A0=E9=99=A4=E6=89=80=E6=9C=89?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9=EF=BC=8C=E5=B0=86=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=92=8C=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=BC=B9=E6=A1=86=E8=AE=BE=E7=BD=AE=E4=B8=BA=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=BC=B9=E6=A1=86=E5=A4=96=E4=B8=8D=E6=B6=88=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/CompanyservicePropController.java | 4 +++- .../jianshui/system/mapper/CompanyservicePropMapper.java | 2 +- .../system/service/ICompanyservicePropService.java | 2 +- .../service/impl/CompanyservicePropServiceImpl.java | 2 +- .../resources/mapper/system/CompanyservicePropMapper.xml | 2 +- .../system/companyservice/companyservice_prop/list.vue | 8 ++++++-- 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/jianshui-admin/src/main/java/com/jianshui/web/controller/system/CompanyservicePropController.java b/jianshui-admin/src/main/java/com/jianshui/web/controller/system/CompanyservicePropController.java index 7db87d5..945f588 100644 --- a/jianshui-admin/src/main/java/com/jianshui/web/controller/system/CompanyservicePropController.java +++ b/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)); } diff --git a/jianshui-system/src/main/java/com/jianshui/system/mapper/CompanyservicePropMapper.java b/jianshui-system/src/main/java/com/jianshui/system/mapper/CompanyservicePropMapper.java index 58e9526..a6d777a 100644 --- a/jianshui-system/src/main/java/com/jianshui/system/mapper/CompanyservicePropMapper.java +++ b/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); diff --git a/jianshui-system/src/main/java/com/jianshui/system/service/ICompanyservicePropService.java b/jianshui-system/src/main/java/com/jianshui/system/service/ICompanyservicePropService.java index 036ccd9..d7c6dcf 100644 --- a/jianshui-system/src/main/java/com/jianshui/system/service/ICompanyservicePropService.java +++ b/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等信息 diff --git a/jianshui-system/src/main/java/com/jianshui/system/service/impl/CompanyservicePropServiceImpl.java b/jianshui-system/src/main/java/com/jianshui/system/service/impl/CompanyservicePropServiceImpl.java index 4169e46..9c32ca2 100644 --- a/jianshui-system/src/main/java/com/jianshui/system/service/impl/CompanyservicePropServiceImpl.java +++ b/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); } diff --git a/jianshui-system/src/main/resources/mapper/system/CompanyservicePropMapper.xml b/jianshui-system/src/main/resources/mapper/system/CompanyservicePropMapper.xml index cdf7bcf..663af4a 100644 --- a/jianshui-system/src/main/resources/mapper/system/CompanyservicePropMapper.xml +++ b/jianshui-system/src/main/resources/mapper/system/CompanyservicePropMapper.xml @@ -62,7 +62,7 @@ - delete from companyservice_prop where companyid in + delete from companyservice_prop where concat(companyid,`key`,`value`) in #{companyid} diff --git a/jianshui-ui/src/views/system/companyservice/companyservice_prop/list.vue b/jianshui-ui/src/views/system/companyservice/companyservice_prop/list.vue index 0cc5068..aaa4c01 100644 --- a/jianshui-ui/src/views/system/companyservice/companyservice_prop/list.vue +++ b/jianshui-ui/src/views/system/companyservice/companyservice_prop/list.vue @@ -109,7 +109,7 @@ /> - + @@ -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('删除成功')