Просмотр исходного кода

[task-1755] 【后端】系统代理功能调整

Li Yuan 1 год назад
Родитель
Сommit
b7d3e0c69b

+ 17 - 1
ibps-provider-root/modules/provider-bpmn/src/main/java/com/lc/ibps/office/provider/BpmReceivedProvider.java

@@ -593,6 +593,7 @@ public class BpmReceivedProvider extends GenericProvider implements IBpmReceived
 			String userId = ContextUtil.getCurrentUserId();
 			queryFilter.addParamsFilter("assignee", userId);
 			queryFilter.addParamsFilter("typeUser", BpmIdentity.TYPE_USER);
+			queryFilter.addParamsFilter("delegatorVisible","Y");
 			bpmTaskRepository.setForUpdate();
 			List<BpmTaskPo> list = bpmTaskRepository.queryByUser(queryFilter);
 			bpmTaskRepository.removeForUpdate();
@@ -622,7 +623,22 @@ public class BpmReceivedProvider extends GenericProvider implements IBpmReceived
 	@ApiOperation(value = "个人中心-待办事务-用户类型", notes = "个人中心-待办事务-用户类型")
 	@Override
 	public APIResult<APIPageList<BpmTaskPo>> pending4User2() {
-		APIResult<APIPageList<BpmTaskPo>> result =  pending4User(new APIRequest(1, 20));
+		APIResult<APIPageList<BpmTaskPo>> result = new APIResult<>();
+		APIRequest request = new APIRequest(1, 20);
+		try {
+			List<BpmTaskPo> list = pendingInternal(request);
+			if(!request.containParameterKey("skipBuildInternal")) {
+				bpmTaskRepository.setBuildInternal();
+				bpmTaskRepository.buildInternal(list);
+				bpmTaskRepository.removeBuildInternal();
+			}
+			this.getExpired(list);
+
+			APIPageList<BpmTaskPo> apiPageList = this.getAPIPageList(list);
+			result.setData(apiPageList);
+		} catch(Exception e) {
+			setExceptionResult(result, StateEnum.ERROR_BPMN.getCode(), I18nUtil.getMessage(StateEnum.ERROR_BPMN.getCode()+""), e);
+		}
 		return result;
 	}