偏离单文件名+P1

yangys

2025-08-24 c9433fab340a766a99b2c01ca018609cac407cee

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java

@@ -6,10 +6,14 @@
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.HistoryService;
import org.flowable.engine.TaskService;
import org.flowable.task.api.history.HistoricTaskInstance;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.mdm.basesetting.producedivision.entity.MdmUser;
import org.springblade.mdm.basesetting.producedivision.service.MdmUserService;
import org.springblade.mdm.flow.service.FlowBusinessService;
import org.springblade.mdm.flow.service.FlowCommonService;
import org.springblade.mdm.flow.service.FlowTransferService;
@@ -32,12 +36,16 @@
   @Autowired
   private TaskService taskService;
   @Autowired
   private MdmUserService mdmUserService;
   @Autowired
   private FlowBusinessService businessService;
   @Autowired
   private IUserSearchClient userSearchClient;

   @Autowired
   private FlowTransferService flowTransferService;
   @Autowired
   private FlowCommonService flowCommonService;
   /**
    * 待办任务列表页
    */
@@ -90,8 +98,18 @@
   @GetMapping("flow-user-list")
   @ApiOperationSupport(order = 3)
   @Operation(summary = "用户下拉数据", description = "用户下拉数据")
   public R<List<User>> flowUserList(@Parameter(description = "部门ID") String deptId) {
      return userSearchClient.listByDept(deptId);
   public R<List<MdmUser>> flowUserList(@Parameter(description = "部门ID") String deptId, String taskId) {

      return R.data(mdmUserService.listByDeptAndRoleAlias());
   }

   /**
    * 上一步审批人查询
    */
   @GetMapping("previus-approve-user")
   @ApiOperationSupport(order = 3)
   @Operation(summary = "上一步审批人查询", description = "上一步审批人查询，返回审批人id")
   public R<String> previusApproveUserId(@Parameter(description = "部门ID") String processInstanceId) {
      return R.data(this.flowCommonService.previusAssignee(processInstanceId));
   }
}