Commit 3b0d2a0f22052acce3e56b279ae56709c8767b31
1 parent
f7276954
fix: [DEFECT-1012] query user page by realName or username error
Showing
1 changed file
with
4 additions
and
0 deletions
| @@ -104,6 +104,8 @@ public class TkUserController extends AbstractUserAccount { | @@ -104,6 +104,8 @@ public class TkUserController extends AbstractUserAccount { | ||
| 104 | @RequestParam(value = "tenantId", required = false) String tenantId, | 104 | @RequestParam(value = "tenantId", required = false) String tenantId, |
| 105 | @RequestParam(value = "organizationId", required = false) String organizationId, | 105 | @RequestParam(value = "organizationId", required = false) String organizationId, |
| 106 | @RequestParam(value = "roleType", required = false) RoleEnum roleType, | 106 | @RequestParam(value = "roleType", required = false) RoleEnum roleType, |
| 107 | + @RequestParam(value = "realName", required = false) String realName, | ||
| 108 | + @RequestParam(value = "username", required = false) String username, | ||
| 107 | @RequestParam(value = ORDER_FILED, required = false) String orderBy, | 109 | @RequestParam(value = ORDER_FILED, required = false) String orderBy, |
| 108 | @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType) | 110 | @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType) |
| 109 | throws ThingsboardException { | 111 | throws ThingsboardException { |
| @@ -111,6 +113,8 @@ public class TkUserController extends AbstractUserAccount { | @@ -111,6 +113,8 @@ public class TkUserController extends AbstractUserAccount { | ||
| 111 | queryMap.put(PAGE_SIZE, pageSize); | 113 | queryMap.put(PAGE_SIZE, pageSize); |
| 112 | queryMap.put(PAGE, page); | 114 | queryMap.put(PAGE, page); |
| 113 | queryMap.put(ORDER_FILED, orderBy); | 115 | queryMap.put(ORDER_FILED, orderBy); |
| 116 | + queryMap.put("realName",realName); | ||
| 117 | + queryMap.put("username",username); | ||
| 114 | if (null != roleType && roleType.equals(RoleEnum.TENANT_ADMIN)) { | 118 | if (null != roleType && roleType.equals(RoleEnum.TENANT_ADMIN)) { |
| 115 | queryMap.put("roleType", roleType.name()); | 119 | queryMap.put("roleType", roleType.name()); |
| 116 | } else { | 120 | } else { |