fix(文档拆分): 80210

2024-01-04 11:00:20 +08:00
parent 86ddedb445
commit 6328c60e79
2 changed files with 7 additions and 10 deletions
@@ -375,7 +375,6 @@ public class DocumentSplitController {
    @RequiresPermissions("split:sarFileSplitItems:copy")
    @ApiOperationSupport(order = 19)
    public Result<T> copyDocumentSplitDetail(String id) {
-        documentSplitService.isHorizontalOverstep(id);
        documentSplitService.copyDocumentSplitDetail(id);
        return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
    }
@@ -391,7 +390,6 @@ public class DocumentSplitController {
    @RequiresPermissions("split:sarFileSplitItems:batchCopy")
    @ApiOperationSupport(order = 20)
    public Result<T> copyBatchDocumentSplitDetail(String ids) {
-        documentSplitService.isHorizontalOverstep(ids);
        documentSplitService.copyBatchDocumentSplitDetail(ids);
        return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
    }
@@ -787,7 +787,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
        // 字段名
        StringBuilder fieldsBuilder = new StringBuilder();
        // 字段值
-        StringBuilder valuesBuilder = new StringBuilder();
+        List<String> valuesList = new ArrayList<>();
        Date date = new Date();
        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        String format = dateFormat.format(date);
@@ -798,8 +798,8 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
        resultMap.put("update_by", loginUser.getUsername());
        resultMap.put("update_time", format);
        // 字段名和值
-        manageData(resultMap, fieldsBuilder, valuesBuilder);
-        documentSplitMapper.insertLawsDocumentSplit(fieldsBuilder.toString(), Arrays.asList(valuesBuilder.toString().split(",")));
+        manageData(resultMap, fieldsBuilder, valuesList);
+        documentSplitMapper.insertLawsDocumentSplit(fieldsBuilder.toString(), valuesList);
    }

    @Override
@@ -1190,14 +1190,14 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        // 发布的只有自己可见，发布的数据所有人可见
        String roleIds = loginUser.getRoleIds();
-        QueryWrapper<LawsDocumentSplit> queryWrapper = new QueryWrapper<>();
+        QueryWrapper<SarFileSplitInfoEO> queryWrapper = new QueryWrapper<>();
        queryWrapper.in("id", Arrays.asList(ids.split(",")));
        queryWrapper.and(qw ->
                qw.and(qwi -> qwi.eq(SPLIT_STATUS, DocumentSplitCommon.SPLIT_STATUS1)
                                .eq("author", loginUser.calcNameWorkNo()))
                        .or().eq(SPLIT_STATUS, DocumentSplitCommon.SPLIT_STATUS2)
                        .or().eq(roleIds.contains("admin"), "author", "云平台"));
-        int count = lawsDocumentSplitMapper.selectCount(queryWrapper);
+        int count = sarFileSplitInfoService.count(queryWrapper);
        if (count <= 0) {
            if(LanguageEnum.CN.equals(MessageUtils.getLanguage())) {
                throw new JeroBootException("无权限!");
@@ -1207,14 +1207,13 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
        }
    }

-    private void manageData(Map<String, Object> resultMap, StringBuilder fieldsBuilder, StringBuilder valuesBuilder) {
+    private void manageData(Map<String, Object> resultMap, StringBuilder fieldsBuilder, List<String> valuesList) {
        // 所有key(字段名)
        resultMap.forEach((k, v) -> {
            fieldsBuilder.append(k).append(",");
-            valuesBuilder.append(v).append(",");
+            valuesList.add(v.toString());
        });
        fieldsBuilder.deleteCharAt(fieldsBuilder.length() - 1);
-        valuesBuilder.deleteCharAt(valuesBuilder.length() - 1);
    }