发测试

2026-07-30 11:43:06 +08:00
parent 2bd4d5bb63
commit 69412f7293
6 changed files with 42 additions and 6 deletions
@@ -434,7 +434,11 @@ public class UserShipperApplicationService {
                        orgItem.put("names", currentOrgId);
                        orgCodeArray.add(orgItem);
                        shipperDO.setOrgCode(orgCodeArray.toJSONString());
-                        addShipper(shipperDO);
+                        Map<String, Object> addResult = addShipper(shipperDO);
+                        Object newUserIdObj = addResult.get("userId");
+                        if (newUserIdObj instanceof Long) {
+                            assignCompanyRoleIfMissing((Long) newUserIdObj, currentOrgId);
+                        }
                        success++;
                    }
                } catch (Exception e) {
@@ -456,6 +460,36 @@ public class UserShipperApplicationService {
        }
    }

+    /**
+     * 导入时若账号没有任何角色，则补分配企业货主角色
+     */
+    private void assignCompanyRoleIfMissing(Long userId, Long organizationId) {
+        if (userId == null || organizationId == null) {
+            return;
+        }
+        List<UserRoleMenuPO> existingRoles = userRoleDomainService.selectRolesByUserId(userId);
+        if (CollUtil.isNotEmpty(existingRoles)) {
+            return;
+        }
+        // 按 role_code + organization_id 精确匹配角色（selectByOrganizationIdAndRoleCode 的 common_where 不含 roleCode 过滤，不适用）
+        RolePO rolePO = roleDomainService.selectByRoleCodeAndOrganizationId(RoleEnum.COMPANY.getCode(), organizationId);
+        if (rolePO == null) {
+            log.warn("组织{}下未找到{}角色，无法为导入用户{}分配角色", organizationId, RoleEnum.COMPANY.getCode(), userId);
+            return;
+        }
+        // 1. 写入 user_role 表
+        UserRoleDo userRoleDo = new UserRoleDo();
+        userRoleDo.setUserId(userId);
+        userRoleDo.setRoleId(rolePO.getRoleId());
+        userRoleDomainService.addUserRole(userRoleDo);
+        // 2. 同步更新 user 表的 role_code / role_name
+        UserDO userDO = new UserDO();
+        userDO.setUserId(userId);
+        userDO.setRoleCode(RoleEnum.COMPANY.getCode());
+        userDO.setRoleName(RoleEnum.COMPANY.getName());
+        userDomainService.updateUser(userDO);
+    }
+
    /**
     * 按Excel模板更新已存在的委托方（只更新模板中的字段）
     */
@@ -530,6 +564,8 @@ public class UserShipperApplicationService {
                userDO.setUserSalt(salt);
            }
            userDomainService.updateUser(userDO);
+            // 如果该账号没有任何角色，补分配企业货主角色，避免登录报“账号未授权角色信息”
+            assignCompanyRoleIfMissing(userId, existingShipper.getOrganizationId());
        }

        // 3. 更新 orgCode 中当前组织的 ncCustomer