wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/REQ-2752' into feature/REQ-2752

Browse Source
This commit is contained in:
wangli 2024-10-14 18:17:16 +08:00
commit 1d7dc30689
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/manage/ProcessAdminApi.java
View File

@ -73,7 +73,7 @@ public interface ProcessAdminApi {
*/
@DeleteMapping("/api/process/admin/delete/criteria")
@InvokeMode(SYNC)
CommonResponse<Integer> deleteProcessAdminCriteria(@RequestParam ProcessAdminDeleteDTO dto);
CommonResponse<Integer> deleteProcessAdminCriteria(@RequestBody ProcessAdminDeleteDTO dto);
/**
* 删除管理员

8
workflow-engine-axzo-ext/src/main/java/cn/axzo/workflow/admin/service/impl/ExtAxProcessAdminServiceImpl.java
View File

@ -107,12 +107,4 @@ public class ExtAxProcessAdminServiceImpl implements ExtAxProcessAdminService {
.eq(ExtAxProcessAdmin::getIsDelete, TableIsDeleteEnum.NORMAL.value);
}
LambdaQueryWrapper<ExtAxProcessAdmin> buildQueryWrapper(ExtAxProcessAdmin processAdmin) {
return new LambdaQueryWrapper<ExtAxProcessAdmin>()
.eq(Objects.nonNull(processAdmin.getId()), ExtAxProcessAdmin::getId, processAdmin.getId())
.eq(Objects.nonNull(processAdmin.getWorkspaceId()), ExtAxProcessAdmin::getWorkspaceId, processAdmin.getWorkspaceId())
.eq(Objects.nonNull(processAdmin.getOrganizationalUnitId()), ExtAxProcessAdmin::getOrganizationalUnitId, processAdmin.getOrganizationalUnitId())
.eq(Objects.nonNull(processAdmin.getPersonId()), ExtAxProcessAdmin::getPersonId, processAdmin.getPersonId())
.eq(Objects.nonNull(processAdmin.getDataSource()), ExtAxProcessAdmin::getDataSource, processAdmin.getDataSource());
}
}