fix(文档拆分): 78581
This commit is contained in:
+7
-2
@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.*;
|
|||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
@@ -175,7 +176,9 @@ public class DocumentSplitController {
|
|||||||
@RequiresPermissions("split:sarFileSplitInfo:delete")
|
@RequiresPermissions("split:sarFileSplitInfo:delete")
|
||||||
public Result<T> delete(@RequestBody Map<String, Object> map) {
|
public Result<T> delete(@RequestBody Map<String, Object> map) {
|
||||||
if (map.containsKey("id")) {
|
if (map.containsKey("id")) {
|
||||||
sarFileSplitInfoService.deleteById((String) map.get("id"));
|
String id = (String) map.get("id");
|
||||||
|
documentSplitService.checkOutOperation(Collections.singletonList(id));
|
||||||
|
sarFileSplitInfoService.deleteById(id);
|
||||||
}
|
}
|
||||||
return Result.OK(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED));
|
return Result.OK(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED));
|
||||||
}
|
}
|
||||||
@@ -192,7 +195,9 @@ public class DocumentSplitController {
|
|||||||
public Result<T> deleteBatch(@RequestBody Map<String, Object> map) {
|
public Result<T> deleteBatch(@RequestBody Map<String, Object> map) {
|
||||||
if (map.containsKey("ids")) {
|
if (map.containsKey("ids")) {
|
||||||
String ids = (String) map.get("ids");
|
String ids = (String) map.get("ids");
|
||||||
sarFileSplitInfoService.deleteByIds(Arrays.asList(ids.split(",")));
|
List<String> list = Arrays.asList(ids.split(","));
|
||||||
|
documentSplitService.checkOutOperation(list);
|
||||||
|
sarFileSplitInfoService.deleteByIds(list);
|
||||||
}
|
}
|
||||||
return Result.OK(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK));
|
return Result.OK(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK));
|
||||||
}
|
}
|
||||||
|
|||||||
+6
@@ -42,6 +42,12 @@ public interface IDocumentSplitService {
|
|||||||
*/
|
*/
|
||||||
void updatePermissions(DocumentSplitInfo documentSplitInfo);
|
void updatePermissions(DocumentSplitInfo documentSplitInfo);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 判断操作权限
|
||||||
|
* @param ids
|
||||||
|
*/
|
||||||
|
void checkOutOperation(List<String> ids);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 文档拆分详情-分页列表查询
|
* 文档拆分详情-分页列表查询
|
||||||
* @param parameter
|
* @param parameter
|
||||||
|
|||||||
+9
-3
@@ -176,8 +176,9 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
|
|||||||
List<DocumentSplitInfo> documentSplitInfos = queryByList(documentSplitInfo);
|
List<DocumentSplitInfo> documentSplitInfos = queryByList(documentSplitInfo);
|
||||||
ids = documentSplitInfos.stream().map(DocumentSplitInfo::getId).collect(Collectors.toList());
|
ids = documentSplitInfos.stream().map(DocumentSplitInfo::getId).collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
// 校验权限
|
|
||||||
checkOut(ids);
|
// 判断操作权限
|
||||||
|
checkOutOperation(ids);
|
||||||
|
|
||||||
updateWrapper.in(SarFileSplitInfoEO::getId, ids);
|
updateWrapper.in(SarFileSplitInfoEO::getId, ids);
|
||||||
SysUser sysUser = sysUserService.getById(documentSplitInfo.getCreateBy());
|
SysUser sysUser = sysUserService.getById(documentSplitInfo.getCreateBy());
|
||||||
@@ -186,7 +187,12 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
|
|||||||
sarFileSplitInfoService.update(updateWrapper);
|
sarFileSplitInfoService.update(updateWrapper);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void checkOut(List<String> ids) {
|
/**
|
||||||
|
* 判断操作权限
|
||||||
|
* @param ids
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public void checkOutOperation(List<String> ids) {
|
||||||
// 登陆人信息
|
// 登陆人信息
|
||||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
if (sysUser.getRoleIds().contains("admin")){
|
if (sysUser.getRoleIds().contains("admin")){
|
||||||
|
|||||||
Reference in New Issue
Block a user