Merge branch 'develop' of gitadmin/tuoheng_oidc into release

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

@@ -323,15 +323,15 @@ public class ClientUserServiceImpl implements ClientUserSevice {
                 if (!"操作成功".equals(jsonResult.getMsg())) {
                     return jsonResult;
                 }
-                //TODO ->会导致循环终止(后期改进)
-                return requestAirport(dto, loginUser, CommonConstant.THREE);
+                ////TODO ->会导致循环终止(后期改进)
+                //return requestAirport(dto, loginUser, CommonConstant.THREE);
             }
         } else {
             JsonResult jsonResult = deleteResult(dto, dto.getClientId(), loginUser);
             if (!"操作成功".equals(jsonResult.getMsg())) {
                 return jsonResult;
             }
-            return requestAirport(dto, loginUser, CommonConstant.THREE);
+            //return requestAirport(dto, loginUser, CommonConstant.THREE);
         }
         return JsonResult.success();
     }
@@ -553,9 +553,9 @@ public class ClientUserServiceImpl implements ClientUserSevice {
             case 2:
                 url = CommonConfig.airportURL + AirportConstant.EDIT_TENANT;
                 break;
-            case 3:
-                url = CommonConfig.airportURL + AirportConstant.DELETE_TENANT+"/"+request.getTenantCode();
-                break;
+            //case 3:
+            //    url = CommonConfig.airportURL + AirportConstant.DELETE_TENANT+"/"+request.getTenantCode();
+            //    break;
             default:
                 break;
         }
@@ -569,9 +569,9 @@ public class ClientUserServiceImpl implements ClientUserSevice {
                 case 2:
                     response = restTemplate.exchange(url, HttpMethod.PUT, httpEntity, JsonResult.class);
                     break;
-                case 3:
-                    response = restTemplate.exchange(url, HttpMethod.DELETE, httpEntity, JsonResult.class);
-                    break;
+                //case 3:
+                //    response = restTemplate.exchange(url, HttpMethod.DELETE, httpEntity, JsonResult.class);
+                //    break;
                 default:
                     break;
             }