Merge branch 'develop' of gitadmin/tuoheng_oidc into release

tuoheng_oidc_admin/src/main/java/com/tuoheng/controller/TenantController.java

@@ -58,8 +58,8 @@ public class TenantController {
      *
      * @return
      */
-    @GetMapping("/findUserLis")
-    public JsonResult findUserLis(UserQuery query) {
+    @GetMapping("/findUserList")
+    public JsonResult findUserList(UserQuery query) {
         return tenantService.findUserList(query);
     }
 

tuoheng_oidc_admin/src/main/java/com/tuoheng/service/impl/TenantServiceImpl.java

@@ -89,7 +89,7 @@ public class TenantServiceImpl implements TenantService {
     @Transactional(rollbackFor = Exception.class)
     public JsonResult createClientTenant(CreateClientTenantDto createClientTenantDto, LoginUser loginUser) {
         if (clientUserMapper.judgeCreateByUserName(createClientTenantDto.getUsername()) > 0) {
-            return JsonResult.error("该用户名称已存在！");
+            return JsonResult.error("该用户账号已存在！");
         }
         createClientTenantDto.setPassword(passward);
         //创建租户创建成功后的返回实体类
@@ -555,7 +555,7 @@ public class TenantServiceImpl implements TenantService {
         dto.setPassword(passward);
         TenantPo tenant = tenantMapper.selectById(dto.getId());
         if (ObjectUtil.isNull(tenant)) {
-            throw new ServiceException(ServiceExceptionEnum.GET_NO_DATA);
+            return JsonResult.error(ServiceExceptionEnum.GET_NO_DATA.getMessage());
         }
         //租户对应的业务平台相关信息
         //删除这个租户原本存在的所有业务平台下的信息