ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(资料中心): 81815

Browse Source
This commit is contained in:
yjz
2024-02-05 17:48:17 +08:00
parent 30b691bdb7
commit ae501481be
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/dataCenter/controller/LawsDataCenterFileController.java
+2 -2
View File
@@ -113,7 +113,7 @@ public class LawsDataCenterFileController extends JeroController<LawsDataCenterF
if (!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))) {
return Result.error("请选择数据!");
}
lawsDataCenterFileService.isHorizontalOverstep(String.valueOf(map.containsKey("id")));
lawsDataCenterFileService.isHorizontalOverstep(String.valueOf(map.get("id")));
lawsDataCenterFileService.deleteById(map.get("id"));
return Result.OK(ResultCommon.OK);
}
@@ -132,7 +132,7 @@ public class LawsDataCenterFileController extends JeroController<LawsDataCenterF
if (!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))) {
return Result.error("请选择数据!");
}
lawsDataCenterFileService.isHorizontalOverstep(String.valueOf(map.containsKey("ids")));
lawsDataCenterFileService.isHorizontalOverstep(String.valueOf(map.get("ids")));
this.lawsDataCenterFileService.deleteByIds(Arrays.asList(map.get("ids").split(",")));
return Result.OK(ResultCommon.OK);
}
laws-modules/src/main/java/com/jero/modules/laws/dataCenter/controller/LawsDataCenterFolderController.java
-2
View File
@@ -55,8 +55,6 @@ public class LawsDataCenterFolderController extends JeroController<LawsDataCente
@PostMapping(value = "/addBrother")
@RequiresPermissions("profileCenter:addPeer")
public Result<T> addBrother(@Validated @RequestBody LawsDataCenterFolder lawsDataCenterFolder) {
// 水平越权
lawsDataCenterFolderService.isHorizontalOverstep(lawsDataCenterFolder.getParentId());
lawsDataCenterFolderService.add(lawsDataCenterFolder);
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
}
laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java
+7 -3
View File
@@ -8,6 +8,7 @@ import com.jero.common.api.dto.message.SendMessageDTO;
import com.jero.common.api.vo.ResultCommon;
import com.jero.common.api.vo.SendMessageAPI;
import com.jero.common.constant.enums.LanguageEnum;
import com.jero.common.constant.enums.YesOrNoEnum;
import com.jero.common.exception.JeroBootException;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.FieldCommon;
@@ -87,7 +88,7 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl<LawsDataCenterFil
.or().like("auth_view_ids", CurrentUserUtil.getId())
.or().like("auth_manage_ids", CurrentUserUtil.getId())
.or().like("push_range_ids", CurrentUserUtil.getId())
.or().eq("default_folder", "1")
.or().eq("default_folder", YesOrNoEnum.YES.getValue())
);
}
queryWrapper.orderByDesc("create_time");
@@ -270,8 +271,10 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl<LawsDataCenterFil
@Override
public void isHorizontalOverstep(String ids) {
if (StringUtils.isBlank(ids)){
return;
}
QueryWrapper<LawsDataCenterFile> queryWrapper = new QueryWrapper<>();
List<String> adminRoleCodeList = Arrays.asList(adminRoleCode.split(","));
Collection<String> intersection = CollectionUtils.intersection(Arrays.asList(CurrentUserUtil.getRoles().split(",")), adminRoleCodeList);
if (!CurrentUserUtil.getRoles().contains(FieldCommon.ROLE_ADMIN) && CollectionUtils.isEmpty(intersection)) {
@@ -279,7 +282,8 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl<LawsDataCenterFil
.eq("owner_id", CurrentUserUtil.getId())
.or().like("auth_view_ids", CurrentUserUtil.getId())
.or().like("auth_manage_ids", CurrentUserUtil.getId())
.or().eq("push_range_ids", CurrentUserUtil.getId())
.or().like("push_range_ids", CurrentUserUtil.getId())
.or().eq("default_folder", YesOrNoEnum.YES.getValue())
);
}else {
return;
laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFolderServiceImpl.java
+3
View File
@@ -233,6 +233,9 @@ public class LawsDataCenterFolderServiceImpl extends ServiceImpl<LawsDataCenterF
@Override
public void isHorizontalOverstep(String ids) {
if (StringUtils.isBlank(ids)){
return;
}
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleIds = loginUser.getRoleIds();
// 全部数据