QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:87600

Browse Source
This commit is contained in:
梁琦涛
2024-07-26 17:14:16 +08:00
parent eb009d79fe
commit 3e7479de6f
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java
+11 -4
View File
@@ -72,6 +72,12 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
public static final String CLASS = "entity";
public static final String PARAMS = "params";
/**
* 其他管理员
*/
@Value("${sys_role.other_admin}")
private List<String> otherAdmin;
/**
* 法规管理员
*/
@@ -160,6 +166,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
// 已发布的清单所有人都可以查看，未发布的数据只能作者和管理管查看、编辑、删除
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
&& !Arrays.asList(sysUser.getRoleIds().split(",")).stream().anyMatch(otherAdmin::contains)
&& !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)){
queryWrapper.and(i->i.eq("ms.manifest_status",MarketStandardConstants.MANIFEST_STATUS_PUBLISH).or()
.eq("ms.author",sysUser.getId()));
@@ -223,6 +230,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// 已发布的清单所有人都可以查看，未发布的数据只能作者和管理管查看、编辑、删除
if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
&& !Arrays.asList(sysUser.getRoleIds().split(",")).stream().anyMatch(otherAdmin::contains)
&& !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
&& !Objects.equals(sysUser.getId(),lawsMarketStandardOld.getAuthor())){
throw new JeroBootException("没有权限");
@@ -306,6 +314,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
}else{
// 状态未发布的数据只能作者和管理员查看、编辑、删除
if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
&& !Arrays.asList(sysUser.getRoleIds().split(",")).stream().anyMatch(otherAdmin::contains)
&& !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
&& !Objects.equals(sysUser.getId(),lawsMarketStandard.getAuthor())){
return Result.error("没有权限");
@@ -360,11 +369,8 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
}
// 已发布的清单所有人都可以查看，未发布的数据只能作者和管理管查看、编辑、删除
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
log.info("=====" + !Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin));
log.info("=====" + !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin));
log.info("=====" + !Objects.equals(manifest.getAuthor(),sysUser.getId()));
log.info("=====" + !Objects.equals(manifest.getManifestStatus(),MarketStandardConstants.MANIFEST_STATUS_PUBLISH));
if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
&& !Arrays.asList(sysUser.getRoleIds().split(",")).stream().anyMatch(otherAdmin::contains)
&& !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
&& !Objects.equals(manifest.getAuthor(),sysUser.getId())
&& !Objects.equals(manifest.getManifestStatus(),MarketStandardConstants.MANIFEST_STATUS_PUBLISH)){
@@ -433,6 +439,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
// 已发布的清单所有人都可以查看，未发布的数据只能作者和管理管查看、编辑、删除
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
&& !Arrays.asList(sysUser.getRoleIds().split(",")).stream().anyMatch(otherAdmin::contains)
&& !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
&& !Objects.equals(lawsMarketStandardOld.getAuthor(),sysUser.getId())){
return Result.error("没有权限");