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

fix 78554 【垂直越权】国内标准-垂直越权问题

Browse Source
This commit is contained in:
liao
2023-11-27 09:19:28 +08:00
parent af72562af1
commit e9d70ca171
5 changed files with 136 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/common/ConsultationTaskKey.java
+1 -1
View File
@@ -13,7 +13,7 @@ public class ConsultationTaskKey {
public static final String ENGINEER_START_END = "engineer_start_end"; // 法规工程师审批
public static final String REJECT = "reject"; // 法规工程师驳回
public static final String REJECT = "reject"; // 驳回
public static final String DEPART_LEADER_START_1 = "depart_leader_start_1"; // 各部所主管级领导分发
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java
+10 -1
View File
@@ -356,12 +356,21 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
List<Task> taskList = taskService.createTaskQuery().processInstanceId(processInstanceId).list();
List<Execution> executionList = runtimeService.createExecutionQuery().processInstanceId(processInstanceId).list();
log.info("还剩 {} 个任务待完成", taskList.size());
taskList.forEach(lastTask -> {
log.info("=======================================================================");
log.info("任务id: {}", lastTask.getId());
log.info("任务name: {}", lastTask.getName());
log.info("任务executionId: {}", lastTask.getExecutionId());
log.info("=======================================================================");
});
log.info("还剩 {} 个执行实例待完成", executionList.size());
taskList.forEach(lastTask -> log.info("任务id: {}", lastTask.getId()));
executionList.forEach(lastExecution -> {
log.info("=======================================================================");
log.info("执行实例id: {}", lastExecution.getId());
log.info("执行实例parentId: {}", lastExecution.getParentId());
log.info("执行实例name: {}", lastExecution.getName());
log.info("执行实例activityId: {}", lastExecution.getActivityId());
log.info("=======================================================================");
});
}
}
laws-modules/src/main/java/com/jero/modules/laws/library/controller/LawsProblemLibraryController.java
+3
View File
@@ -62,6 +62,7 @@ public class LawsProblemLibraryController extends JeroController<LawsProblemLibr
@AutoLog(value = "国内标准-提出问题")
@ApiOperation(value="国内标准-提出问题", notes="国内标准-提出问题")
@PostMapping(value = "/addProblem/GB")
@RequiresPermissions("domesticStandard:submitQuestion")
public Result<T> addProblemGB(@Validated @RequestBody LawsProblemLibrary lawsProblemLibrary) {
lawsProblemLibrary.setType("1");
lawsProblemLibraryService.addProblem(lawsProblemLibrary);
@@ -71,6 +72,7 @@ public class LawsProblemLibraryController extends JeroController<LawsProblemLibr
@AutoLog(value = "海外标准-提出问题")
@ApiOperation(value="海外标准-提出问题", notes="海外标准-提出问题")
@PostMapping(value = "/addProblem/FB")
@RequiresPermissions("overseasStandard:submitQuestion")
public Result<T> addProblemFB(@Validated @RequestBody LawsProblemLibrary lawsProblemLibrary) {
lawsProblemLibrary.setType("2");
lawsProblemLibraryService.addProblem(lawsProblemLibrary);
@@ -80,6 +82,7 @@ public class LawsProblemLibraryController extends JeroController<LawsProblemLibr
@AutoLog(value = "企业标准-提出问题")
@ApiOperation(value="企业标准-提出问题", notes="企业标准-提出问题")
@PostMapping(value = "/addProblem/QB")
@RequiresPermissions("enterpriseStandard:detail:submitQuestion")
public Result<T> addProblemQB(@Validated @RequestBody LawsProblemLibrary lawsProblemLibrary) {
lawsProblemLibrary.setType("3");
lawsProblemLibraryService.addProblem(lawsProblemLibrary);
laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java
+3
View File
@@ -119,6 +119,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
@ApiOperation(value = "标准分享-国内分享", notes = "标准分享-国内分享")
@PostMapping(value = "/domestic/add")
@ApiOperationSupport(order = 3)
@RequiresPermissions("domesticStandard:share")
public Result<T> domesticAdd(@Validated @RequestBody LawsStandardSharing lawsStandardSharing) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
SysUser user = sysUserService.getById(sysUser.getId());
@@ -174,6 +175,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
@ApiOperation(value = "标准分享-海外分享", notes = "标准分享-海外分享")
@PostMapping(value = "/overseas/add")
@ApiOperationSupport(order = 4)
@RequiresPermissions("overseasStandard:share")
public Result<T> overseasAdd(@Validated @RequestBody LawsStandardSharing lawsStandardSharing) {
// 发送消息
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -213,6 +215,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
@ApiOperation(value = "标准分享-企标分享", notes = "标准分享-企标分享")
@PostMapping(value = "/enterprise/add")
@ApiOperationSupport(order = 5)
@RequiresPermissions("enterpriseStandard:share")
public Result<T> enterpriseAdd(@Validated @RequestBody LawsStandardSharing lawsStandardSharing) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
SysUser user = sysUserService.getById(sysUser.getId());