Merge remote-tracking branch 'origin/dev'

颜惠青
2 parents 2b5c73f6 a8e895fc
Showing 3 changed files with 9 additions and 3 deletions
urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/task/BpmProcessInstanceController.java
urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/task/BpmTaskController.java
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/service/permission/RoleServiceImpl.java
@@ -23,6 +23,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
+import jakarta.annotation.security.PermitAll;
 import jakarta.validation.Valid;
 import org.flowable.engine.history.HistoricProcessInstance;
 import org.flowable.engine.repository.ProcessDefinition;
@@ -173,7 +174,8 @@ public class BpmProcessInstanceController {
     @GetMapping("/get-approval-detail")
     @Operation(summary = "获得审批详情")
     @Parameter(name = "id", description = "流程实例的编号", required = true)
-    @PreAuthorize("@ss.hasPermission('bpm:process-instance:query')")
+    //@PreAuthorize("@ss.hasPermission('bpm:process-instance:query')")
+    @PermitAll
     @SuppressWarnings("unchecked")
     public CommonResult<BpmApprovalDetailRespVO> getApprovalDetail(@Valid BpmApprovalDetailReqVO reqVO) {
         if (StrUtil.isNotEmpty(reqVO.getProcessVariablesStr())) {
@@ -20,6 +20,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
+import jakarta.annotation.security.PermitAll;
 import jakarta.validation.Valid;
 import org.flowable.bpmn.model.UserTask;
 import org.flowable.engine.history.HistoricProcessInstance;
@@ -124,7 +125,8 @@ public class BpmTaskController {
     @GetMapping("/list-by-process-instance-id")
     @Operation(summary = "获得指定流程实例的任务列表", description = "包括完成的、未完成的")
     @Parameter(name = "processInstanceId", description = "流程实例的编号", required = true)
-    @PreAuthorize("@ss.hasPermission('bpm:task:query')")
+    //@PreAuthorize("@ss.hasPermission('bpm:task:query')")
+    @PermitAll
     public CommonResult<List<BpmTaskRespVO>> getTaskListByProcessInstanceId(
             @RequestParam("processInstanceId") String processInstanceId) {
         List<HistoricTaskInstance> taskList = taskService.getTaskListByProcessInstanceId(processInstanceId, true);
@@ -11,6 +11,7 @@ import com.zteits.urbanops.framework.common.enums.CommonStatusEnum;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
 import com.zteits.urbanops.framework.common.util.collection.CollectionUtils;
 import com.zteits.urbanops.framework.common.util.object.BeanUtils;
+import com.zteits.urbanops.framework.datapermission.core.annotation.DataPermission;
 import com.zteits.urbanops.module.system.controller.admin.permission.vo.role.RolePageReqVO;
 import com.zteits.urbanops.module.system.controller.admin.permission.vo.role.RoleRespVO;
 import com.zteits.urbanops.module.system.controller.admin.permission.vo.role.RoleSaveReqVO;
@@ -64,11 +65,12 @@ public class RoleServiceImpl implements RoleService {
      * 从缓存中批量获取角色信息，缓存未命中则查询数据库并缓存结果
      */
     @Override
-    @Cacheable(value = "role", key = "#roleIdList.toString()", unless = "#result.isEmpty()")
+    //@Cacheable(value = "role", key = "#roleIdList.toString()", unless = "#result.isEmpty()")
     // 缓存注解说明：
     // value：缓存名称，区分不同模块缓存
     // key：缓存键，用角色ID列表拼接作为唯一键
     // unless：结果为空时不缓存，避免无效缓存
+    @DataPermission(enable = false)
     public Map<Long, RoleDO> getRoleMapFromCache(List<Long> roleIdList) {
         // 1. 空值处理，避免无效查询
         if (CollUtil.isEmpty(roleIdList)) {