Merge branch 'dev' into test

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

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