字段修改

themis-backend/src/main/java/com/qmth/themis/backend/api/TBUserController.java

@@ -544,8 +544,8 @@ public class TBUserController {
     @ApiOperation(value = "用户查询接口")
     @RequestMapping(value = "/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "用户信息", response = TBUserDto.class)})
-    public Result query(@ApiParam(value = "用户id", required = false) @RequestParam(required = false) Long id, @ApiParam(value = "登录名", required = false) @RequestParam(required = false) String loginName, @ApiParam(value = "姓名", required = false) @RequestParam(required = false) String name, @ApiParam(value = "角色", required = false) @RequestParam(required = false) String role, @ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Integer enable, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
-        IPage<TBUserDto> tbUserIPage = tbUserService.userQuery(new Page<>(pageNumber, pageSize), id, loginName, name, role, enable);
+    public Result query(@ApiParam(value = "用户id", required = false) @RequestParam(required = false) Long id, @ApiParam(value = "登录名", required = false) @RequestParam(required = false) String loginName, @ApiParam(value = "姓名", required = false) @RequestParam(required = false) String name, @ApiParam(value = "角色", required = false) @RequestParam(required = false) String roleCode, @ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Integer enable, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
+        IPage<TBUserDto> tbUserIPage = tbUserService.userQuery(new Page<>(pageNumber, pageSize), id, loginName, name, roleCode, enable);
         List<TBUserDto> tbUserDtoList = tbUserIPage.getRecords();
         BasePage basePage = new BasePage(tbUserDtoList, tbUserIPage.getCurrent(), tbUserIPage.getSize(), tbUserIPage.getTotal());
         tbUserDtoList.forEach(s -> {
@@ -574,7 +574,7 @@ public class TBUserController {
             @ApiJsonProperty(key = "password", description = "密码，新增必须"),
             @ApiJsonProperty(key = "enable", type = "int", example = "1", description = "是否启用"),
             @ApiJsonProperty(key = "mobileNumber", description = "手机号"),
-            @ApiJsonProperty(key = "roles", description = "角色")
+            @ApiJsonProperty(key = "roleCode", description = "角色")
     }) @ApiParam(value = "用户信息", required = true) @RequestBody Map<String, Object> mapParameter) {
         if (Objects.isNull(mapParameter)) {
             throw new BusinessException(ExceptionResultEnum.USER_INFO_IS_NULL);
@@ -586,7 +586,7 @@ public class TBUserController {
         try {
             Gson gson = new Gson();
             TBUser tbUser = gson.fromJson(gson.toJson(mapParameter), TBUser.class);
-            List<String> roleList = (List<String>) mapParameter.get("roles");
+            List<String> roleList = (List<String>) mapParameter.get("roleCode");
             Set<String> roleSet = null;
             if (Objects.nonNull(roleList) && roleList.size() > 0) {
                 roleSet = new HashSet<>(roleList);