From 01f2c859f3af6d0e555a1e7354b5fa908d81dc5e Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Mon, 27 Nov 2023 16:13:05 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86):=20?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsCustomCompareInfoController.java | 14 ++++++++------ .../controller/DocumentSplitController.java | 11 ++++++----- .../documenttool/mapper/DocumentSplitMapper.java | 2 +- .../mapper/xml/DocumentSplitMapper.xml | 7 +++++-- .../service/impl/DocumentSplitServiceImpl.java | 10 +++++----- .../split/mapper/SarFileSplitMenuEOMapper.java | 2 +- 6 files changed, 26 insertions(+), 20 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/controller/LawsCustomCompareInfoController.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/controller/LawsCustomCompareInfoController.java index cf83cdd2..1057b46e 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/controller/LawsCustomCompareInfoController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/controller/LawsCustomCompareInfoController.java @@ -237,10 +237,11 @@ public class LawsCustomCompareInfoController { @PostMapping(value = "/delById") @RequiresPermissions("customComparison:delete") public Result delById(@RequestBody IdMapBody map) { - if (StringUtils.isBlank(map.getId())){ - lawsCustomCompareInfoService.delById(map.getId()); - lawsCustomCompareInfoService.editCompareCreateTime(map.getId()); + if (StringUtils.isBlank(map.getId())) { + return Result.error("请选择数据!"); } + lawsCustomCompareInfoService.delById(map.getId()); + lawsCustomCompareInfoService.editCompareCreateTime(map.getId()); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } @@ -253,10 +254,11 @@ public class LawsCustomCompareInfoController { @PostMapping(value = "/delInventoryById") @RequiresPermissions("customComparison:edit") public Result delInventoryById(@RequestBody IdMapBody map) { - if (StringUtils.isBlank(map.getId())){ - lawsCustomCompareInventoryService.removeById(map.getId()); - lawsCustomCompareInfoService.editCompareCreateTime(map.getId()); + if (StringUtils.isBlank(map.getId())) { + return Result.error("请选择数据!"); } + lawsCustomCompareInventoryService.removeById(map.getId()); + lawsCustomCompareInfoService.editCompareCreateTime(map.getId()); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java index 0086c4de..66368a33 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java @@ -190,12 +190,13 @@ public class DocumentSplitController { @PostMapping(value = "/delete") @RequiresPermissions("split:sarFileSplitInfo:delete") @ApiOperationSupport(order = 9) - public Result delete(@RequestBody IdMapBody map) { - if (StringUtils.isBlank(map.getId())){ - String id = map.getId(); - documentSplitService.checkOutOperation(Collections.singletonList(id)); - sarFileSplitInfoService.deleteById(id); + public Result delete(@RequestBody IdMapBody map){ + if (StringUtils.isBlank(map.getId())) { + return Result.error("请选择数据!"); } + documentSplitService.checkOutOperation(Collections.singletonList(map.getId())); + sarFileSplitInfoService.deleteById(map.getId()); + return Result.OK(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED)); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java index 39efc198..cd63bfc6 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java @@ -125,7 +125,7 @@ public interface DocumentSplitMapper { * @param insertValue * @return */ - int insertLawsDocumentSplit(@Param("insertField") String insertField, @Param("insertValue") String insertValue); + int insertLawsDocumentSplit(@Param("insertField") String insertField, @Param("insertValue") List insertValue); /** * 条目批量删除根据itemId diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml index 4d565269..c09b1195 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml @@ -20,7 +20,10 @@ insert into laws_document_split(${insertField}) - values (${insertValue}) + values + + #{value} + @@ -109,7 +112,7 @@ file_type, file_name, split_status, - (IF(i.is_asms_import = '1', i.author, concat(u.realname, '(', u.username, ')'))) as author, + (IF(i.is_asms_import = '1' and u.id is null, i.author, concat(u.realname, '(', u.username, ')'))) as author, i.create_time, i.split_result, u2.id createBy, diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java index 6988aea3..0ab7247b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java @@ -744,7 +744,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { resultMap.put("update_time", format); // 字段名和值 manageData(resultMap, fieldsBuilder, valuesBuilder); - documentSplitMapper.insertLawsDocumentSplit(fieldsBuilder.toString(), valuesBuilder.toString()); + documentSplitMapper.insertLawsDocumentSplit(fieldsBuilder.toString(), Arrays.asList(valuesBuilder.toString().split(","))); } @Override @@ -993,11 +993,11 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { }); List keyList = new ArrayList<>(map.keySet()); - List valueList = map.values().stream().map(o -> (o + "").replace("'", "\\'") ).collect(Collectors.toList()); + List valueList = map.values().stream().map(o -> (String.valueOf(o))).collect(Collectors.toList()); // 新增数据 String insertField = String.join(",", keyList); - String insertValue = "'" + String.join("','", valueList)+ "'"; - documentSplitMapper.insertLawsDocumentSplit(insertField, insertValue); +// String insertValue = "'" + String.join("','", valueList)+ "'"; + documentSplitMapper.insertLawsDocumentSplit(insertField, valueList); // 条目信息(旧) List sarFileSplitItemsVal = documentSplitMapper.querySarFileSplitItemsValByItemId(oldId); @@ -1106,7 +1106,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { // 所有key(字段名) resultMap.forEach((k, v) -> { fieldsBuilder.append(k).append(","); - valuesBuilder.append("'").append(v).append("'").append(","); + valuesBuilder.append(v).append(","); }); fieldsBuilder.deleteCharAt(fieldsBuilder.length() - 1); valuesBuilder.deleteCharAt(valuesBuilder.length() - 1); diff --git a/laws-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitMenuEOMapper.java b/laws-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitMenuEOMapper.java index 29a22c4c..62d96908 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitMenuEOMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitMenuEOMapper.java @@ -48,7 +48,7 @@ public interface SarFileSplitMenuEOMapper extends BaseMapper int deleteByIdList(@Param("idList") List idList); - SarFileSplitMenuEO selectGeneral(@Param("infoId") String infoId); + List selectGeneral(@Param("infoId") String infoId); int insert(SarFileSplitMenuEO sarFileSplitMenuEO);