fix(文档拆分): 临时提交
This commit is contained in:
-4
@@ -292,7 +292,6 @@ public class DocumentSplitController {
|
|||||||
@RequiresPermissions("split:sarFileSplitItems:update")
|
@RequiresPermissions("split:sarFileSplitItems:update")
|
||||||
@ApiOperationSupport(order = 14)
|
@ApiOperationSupport(order = 14)
|
||||||
public Result<T> editDocumentSplitDetail(@RequestBody @ApiParam("标签管理") Map<String, Object> parameter) {
|
public Result<T> editDocumentSplitDetail(@RequestBody @ApiParam("标签管理") Map<String, Object> parameter) {
|
||||||
documentSplitService.isHorizontalOverstep((String) parameter.get("id"));
|
|
||||||
documentSplitService.editDocumentSplitDetail(parameter);
|
documentSplitService.editDocumentSplitDetail(parameter);
|
||||||
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
|
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
|
||||||
}
|
}
|
||||||
@@ -308,7 +307,6 @@ public class DocumentSplitController {
|
|||||||
@RequiresPermissions("split:sarFileSplitItems:batchDelete")
|
@RequiresPermissions("split:sarFileSplitItems:batchDelete")
|
||||||
@ApiOperationSupport(order = 15)
|
@ApiOperationSupport(order = 15)
|
||||||
public Result<T> editBatchDocumentSplitDetail(@RequestBody @ApiParam("标签管理") Map<String, Object> parameter) {
|
public Result<T> editBatchDocumentSplitDetail(@RequestBody @ApiParam("标签管理") Map<String, Object> parameter) {
|
||||||
documentSplitService.isHorizontalOverstep((String) parameter.get("ids"));
|
|
||||||
try {
|
try {
|
||||||
documentSplitService.editBatchDocumentSplitDetail(parameter);
|
documentSplitService.editBatchDocumentSplitDetail(parameter);
|
||||||
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
|
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
|
||||||
@@ -329,7 +327,6 @@ public class DocumentSplitController {
|
|||||||
@RequiresPermissions("split:sarFileSplitItems:delete")
|
@RequiresPermissions("split:sarFileSplitItems:delete")
|
||||||
@ApiOperationSupport(order = 16)
|
@ApiOperationSupport(order = 16)
|
||||||
public Result<T> deleteDocumentSplitDetail(@RequestBody Map<String, Object> parameter) {
|
public Result<T> deleteDocumentSplitDetail(@RequestBody Map<String, Object> parameter) {
|
||||||
documentSplitService.isHorizontalOverstep((String) parameter.get("id"));
|
|
||||||
documentSplitService.deleteDocumentSplitDetail(parameter);
|
documentSplitService.deleteDocumentSplitDetail(parameter);
|
||||||
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
|
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
|
||||||
}
|
}
|
||||||
@@ -344,7 +341,6 @@ public class DocumentSplitController {
|
|||||||
@PostMapping(value = "/deleteBatchDocumentSplitDetail")
|
@PostMapping(value = "/deleteBatchDocumentSplitDetail")
|
||||||
@ApiOperationSupport(order = 17)
|
@ApiOperationSupport(order = 17)
|
||||||
public Result<T> deleteBatchDocumentSplitDetail(@RequestBody Map<String, Object> parameter) {
|
public Result<T> deleteBatchDocumentSplitDetail(@RequestBody Map<String, Object> parameter) {
|
||||||
documentSplitService.isHorizontalOverstep((String) parameter.get("ids"));
|
|
||||||
documentSplitService.deleteBatchDocumentSplitDetail(parameter);
|
documentSplitService.deleteBatchDocumentSplitDetail(parameter);
|
||||||
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
|
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
|
||||||
}
|
}
|
||||||
|
|||||||
+8
-1
@@ -687,6 +687,9 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
|
|||||||
StringBuilder strSelectCondition = new StringBuilder(selectCondition);
|
StringBuilder strSelectCondition = new StringBuilder(selectCondition);
|
||||||
// 查询数据
|
// 查询数据
|
||||||
List<Map<String, Object>> listMap = documentSplitMapper.queryDocumentSplitDetail(selectColumn, strSelectCondition.toString());
|
List<Map<String, Object>> listMap = documentSplitMapper.queryDocumentSplitDetail(selectColumn, strSelectCondition.toString());
|
||||||
|
// 水平越权
|
||||||
|
String infoIds = listMap.stream().map(v -> v.get(INFO_ID).toString()).collect(Collectors.joining(","));
|
||||||
|
isHorizontalOverstep(infoIds);
|
||||||
// 排序(根据条文号)
|
// 排序(根据条文号)
|
||||||
listMap.sort(new DirectoryComparator());
|
listMap.sort(new DirectoryComparator());
|
||||||
// 第一条数据
|
// 第一条数据
|
||||||
@@ -747,7 +750,9 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
|
|||||||
@Override
|
@Override
|
||||||
public void deleteDocumentSplitDetail(Map<String, Object> parameter) {
|
public void deleteDocumentSplitDetail(Map<String, Object> parameter) {
|
||||||
String id = (String) parameter.get(ID);
|
String id = (String) parameter.get(ID);
|
||||||
|
// 水平越权
|
||||||
|
Map<String, Object> map = documentSplitMapper.queryLawsDocumentSplitInId(id);
|
||||||
|
isHorizontalOverstep(map.get(INFO_ID).toString());
|
||||||
// 删除文档拆分详情数据
|
// 删除文档拆分详情数据
|
||||||
documentSplitMapper.deleteDocumentSplitDetail(id);
|
documentSplitMapper.deleteDocumentSplitDetail(id);
|
||||||
|
|
||||||
@@ -784,6 +789,8 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
|
|||||||
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
// 查询数据
|
// 查询数据
|
||||||
Map<String, Object> resultMap = documentSplitMapper.queryLawsDocumentSplitById(id);
|
Map<String, Object> resultMap = documentSplitMapper.queryLawsDocumentSplitById(id);
|
||||||
|
// 水平越权
|
||||||
|
isHorizontalOverstep(resultMap.get(INFO_ID).toString());
|
||||||
// 字段名
|
// 字段名
|
||||||
StringBuilder fieldsBuilder = new StringBuilder();
|
StringBuilder fieldsBuilder = new StringBuilder();
|
||||||
// 字段值
|
// 字段值
|
||||||
|
|||||||
Reference in New Issue
Block a user