Merge remote-tracking branch 'base-version/test' into dev

This commit is contained in:
chenbowen
2026-02-03 09:35:39 +08:00
2 changed files with 30 additions and 0 deletions

View File

@@ -0,0 +1,27 @@
package com.zt.plat.module.bpm.listener;
import lombok.Data;
import org.flowable.engine.delegate.DelegateExecution;
import org.flowable.engine.delegate.JavaDelegate;
import org.flowable.engine.delegate.TaskListener;
import org.flowable.engine.impl.el.FixedValue;
import org.flowable.task.service.delegate.DelegateTask;
/**
*
* 2026/1/30 16:42
*/
@Data
public class DemoDelegateClassExecutionListener implements JavaDelegate, TaskListener {
private FixedValue klwTest;
@Override
public void execute(DelegateExecution execution) {
System.out.println("====================流程监听器执行了!");
}
@Override
public void notify(DelegateTask delegateTask) {
System.out.println("======【" + klwTest.getValue(null) + "】==============任务监听器执行了!");
}
}

View File

@@ -13,6 +13,7 @@ import com.zt.plat.framework.common.pojo.CompanyDeptInfo;
import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.util.collection.CollectionUtils; import com.zt.plat.framework.common.util.collection.CollectionUtils;
import com.zt.plat.framework.common.util.object.BeanUtils; import com.zt.plat.framework.common.util.object.BeanUtils;
import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
import com.zt.plat.framework.datapermission.core.util.DataPermissionUtils; import com.zt.plat.framework.datapermission.core.util.DataPermissionUtils;
import com.zt.plat.framework.security.core.LoginUser; import com.zt.plat.framework.security.core.LoginUser;
import com.zt.plat.module.infra.api.config.ConfigApi; import com.zt.plat.module.infra.api.config.ConfigApi;
@@ -319,6 +320,8 @@ public class AdminUserServiceImpl implements AdminUserService {
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
// todo 优化数据权限的处理逻辑
@DeptDataPermissionIgnore
@LogRecord(type = SYSTEM_USER_TYPE, subType = SYSTEM_USER_DELETE_SUB_TYPE, bizNo = "{{#id}}", @LogRecord(type = SYSTEM_USER_TYPE, subType = SYSTEM_USER_DELETE_SUB_TYPE, bizNo = "{{#id}}",
success = SYSTEM_USER_DELETE_SUCCESS) success = SYSTEM_USER_DELETE_SUCCESS)
public void deleteUser(Long id) { public void deleteUser(Long id) {