This commit is contained in:
2025-09-15 12:42:57 +08:00
parent 310b80fac3
commit 9c3e11fa50
15 changed files with 263 additions and 61 deletions

View File

@@ -206,22 +206,31 @@ public class BizModuleController extends BaseController {
if (!"0".equals(current.getStatus())) {
return AjaxResult.error("仅可指派待接取的模块");
}
// 前端传递的是用户名需要转换为用户ID
if (bizModule.getAssignee() != null && !bizModule.getAssignee().isEmpty()) {
try {
// 先尝试解析为数字用户ID
Long userId = Long.parseLong(bizModule.getAssignee());
bizModule.setDesignatedUser(userId);
} catch (NumberFormatException e) {
// 如果不是数字说明是用户名需要查询用户ID
SysUser user = userService.selectUserByUserName(bizModule.getAssignee());
if (user != null) {
bizModule.setDesignatedUser(user.getUserId());
} else {
return AjaxResult.error("用户不存在");
// 仅使用用户ID。优先使用前端传来的 designatedUser
// 如为兼容历史,若未提供 designatedUser 而提供了 assignee则尝试解析/转换为ID。
Long targetUserId = bizModule.getDesignatedUser();
if (targetUserId == null) {
String assigneeRaw = bizModule.getAssignee();
if (assigneeRaw != null && !assigneeRaw.isEmpty()) {
try {
targetUserId = Long.parseLong(assigneeRaw);
} catch (NumberFormatException e) {
SysUser user = userService.selectUserByUserName(assigneeRaw);
if (user != null) {
targetUserId = user.getUserId();
}
}
}
}
if (targetUserId == null) {
return AjaxResult.error("请选择要指派的用户");
}
// 校验用户是否存在
SysUser designated = userService.selectUserById(targetUserId);
if (designated == null) {
return AjaxResult.error("用户不存在");
}
bizModule.setDesignatedUser(targetUserId);
return toAjax(bizModuleService.assignModule(bizModule));
}