From 0210ed9b70b2d7769d4af96b2b44388bd71a5e0c Mon Sep 17 00:00:00 2001
From: qraddx <eoyacm81453@unionstone.com.cn>
Date: Thu, 24 Mar 2022 08:36:07 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20Introducing=20new=20features.=20cl?=
 =?UTF-8?q?osed=20#3727=20=E6=94=AF=E6=8C=81=E7=A7=9F=E6=88=B7=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E5=9F=9F=E5=90=8D=E8=87=AA=E5=8A=A8=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/2pigxx.sql                                 |  3 ++-
 .../pigx/admin/api/entity/SysTenant.java      |  6 ++++++
 .../admin/controller/SysTenantController.java | 20 +++++--------------
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/db/2pigxx.sql b/db/2pigxx.sql
index 2439ee74b..ab36c632d 100644
--- a/db/2pigxx.sql
+++ b/db/2pigxx.sql
@@ -769,6 +769,7 @@ CREATE TABLE `sys_tenant` (
                               `id` bigint NOT NULL COMMENT '租户id',
                               `name` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
                               `code` varchar(64) CHARACTER SET utf8mb4 DEFAULT NULL,
+                              `tenant_domain` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
                               `start_time` datetime DEFAULT NULL COMMENT '开始时间',
                               `end_time` datetime DEFAULT NULL COMMENT '结束时间',
                               `status` char(1) CHARACTER SET utf8mb4 DEFAULT '0',
@@ -784,7 +785,7 @@ CREATE TABLE `sys_tenant` (
 -- Records of sys_tenant
 -- ----------------------------
 BEGIN;
-INSERT INTO `sys_tenant` VALUES (1, '北京分公司', '1', '2019-05-15 00:00:00', '2029-05-15 00:00:00', '0', '0', ' ', ' ', '2019-05-15 15:44:57', '2022-02-10 05:38:48');
+INSERT INTO `sys_tenant` VALUES (1, '北京分公司', '1', '','2019-05-15 00:00:00', '2029-05-15 00:00:00', '0', '0', ' ', ' ', '2019-05-15 15:44:57', '2022-02-10 05:38:48');
 COMMIT;
 
 -- ----------------------------
diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenant.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenant.java
index e4a0a2a21..332edd33b 100755
--- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenant.java
+++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenant.java
@@ -58,6 +58,12 @@ public class SysTenant extends Model<SysTenant> {
 	@ApiModelProperty(value = "租户编号")
 	private String code;
 
+	/**
+	 * 租户域名
+	 */
+	@ApiModelProperty(value = "租户域名")
+	private String tenantDomain;
+
 	/**
 	 * 开始时间
 	 */
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTenantController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTenantController.java
index b626398c0..0cb15504b 100755
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTenantController.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTenantController.java
@@ -61,23 +61,13 @@ public class SysTenantController {
 	}
 
 	/**
-	 * 通过id查询租户
-	 * @param id id
-	 * @return R
-	 */
-	@GetMapping("/{id}")
-	public R getById(@PathVariable("id") Long id) {
-		return R.ok(sysTenantService.getById(id));
-	}
-
-	/**
-	 * 通过租户编码查询租户信息
-	 * @param code 租户Code
+	 * 查询租户信息
+	 * @param tenant 查询条件
 	 * @return 租户信息
 	 */
-	@GetMapping("/code/{code}")
-	public R getByTenantCode(@PathVariable String code) {
-		return R.ok(sysTenantService.list(Wrappers.<SysTenant>lambdaQuery().eq(SysTenant::getCode, code)));
+	@GetMapping
+	public R getByObj(SysTenant tenant) {
+		return R.ok(sysTenantService.list(Wrappers.query(tenant)));
 	}
 
 	/**