Merge branch 'develop' of gitadmin/tuoheng_oidc into release

tuoheng_oidc_admin/src/main/java/com/tuoheng/common/ExceptionCatch.java

@@ -18,9 +18,8 @@ public class ExceptionCatch {
      */
     @ExceptionHandler(Exception.class)
     @ResponseBody
-    public JsonResult exception(Exception e){
-        e.printStackTrace();
-        log.error("catch exception:{}",e.getMessage());
+    public JsonResult<Object> exception(Exception e){
+        log.error("系统异常，异常信息：{}", e.getMessage());
         return JsonResult.error(e.getMessage());
     }
 
@@ -31,7 +30,7 @@ public class ExceptionCatch {
      */
     @ExceptionHandler(ServiceException.class)
     @ResponseBody
-    public JsonResult exception(ServiceException e){
+    public JsonResult<Object> exception(ServiceException e){
         log.error("catch exception:{}",e.getMessage());
         return JsonResult.error(e.getMessage());
     }

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

@@ -560,6 +560,9 @@ public class TenantServiceImpl implements TenantService {
         }
         //现有list
         List<ClientRoleDto> list = dto.getClientRoleDtoList();
+        if (CollectionUtil.isEmpty(list)) {
+            return JsonResult.success("租户关联的业务平台系统不能为空");
+        }
         log.info("现有集合:{}", list.toString());
         //现有集合
         List<ClientRoleDto> clientRoleDtos = getClientRoleDtos(list);