选择车队不一致修改

mhd-user-center/src/main/java/com/mhd/user/interfaces/facade/RoleAPI.java

@@ -26,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.List;
 
@@ -57,9 +58,20 @@ public class RoleAPI extends BaseController {
     @Log(title = "职务/角色管理-查询", description ="查询角色列表",businessType = BusinessType.INQUIRE)
     @ApiOperation("查询角色列表-分页")
     @GetMapping("/getUserRolelist")
-    public TableDataInfo getUserRolelist(RoleDTO roleDTO) {
+    public TableDataInfo getUserRolelist(RoleDTO roleDTO, HttpServletRequest request) {
+        // 检查前端是否明确传递了 organizationId 参数
+        // 如果前端没有传递，清空 roleDTO 中的 organizationId，避免从其他地方自动设置的值影响查询
+        String organizationIdParam = request.getParameter("organizationId");
+        log.info("角色查询接口 - 前端传递的 organizationId 参数: {}", organizationIdParam);
+        if (organizationIdParam == null || organizationIdParam.isEmpty()) {
+            log.info("角色查询接口 - 前端未传递 organizationId，清空 roleDTO.organizationId");
+            roleDTO.setOrganizationId(null);
+        } else {
+            log.info("角色查询接口 - 前端传递了 organizationId: {}", organizationIdParam);
+        }
         //转换实体
         RoleDo roleDo = roleAssember.toRoleDo(roleDTO);
+        log.info("角色查询接口 - 转换后 roleDo.getOrganizationId(): {}", roleDo.getOrganizationId());
         startPage();
         List<RolePO> list = roleApplicationService.getUserRolelist(roleDo);
         return getDataTable(list);

mhd-user-center/src/main/java/com/mhd/user/interfaces/vo/NonePagingListVO.java

@@ -17,4 +17,10 @@ public class NonePagingListVO {
   @ApiModelProperty(value = "车队名称")
   private String motorcadeName;
 
+  @ApiModelProperty(value = "组织ID")
+  private Long organizationId;
+
+  @ApiModelProperty(value = "组织名称")
+  private String organizationName;
+
 }