From a3382bd87d0e3b359c03ef3be9fe960302efcf3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 8 Apr 2020 11:24:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E7=A7=9F=E6=88=B7=E7=9A=84=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=8A=E9=99=90=E6=94=B9=E4=B8=BA=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsh/erp/service/tenant/TenantService.java   | 13 +++++++++++--
 src/main/resources/application.properties           |  4 ++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/jsh/erp/service/tenant/TenantService.java b/src/main/java/com/jsh/erp/service/tenant/TenantService.java
index 11f09af5..2fa927fc 100644
--- a/src/main/java/com/jsh/erp/service/tenant/TenantService.java
+++ b/src/main/java/com/jsh/erp/service/tenant/TenantService.java
@@ -10,6 +10,7 @@ import com.jsh.erp.exception.JshException;
 import com.jsh.erp.utils.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -20,11 +21,19 @@ import java.util.*;
 @Service
 public class TenantService {
     private Logger logger = LoggerFactory.getLogger(TenantService.class);
+
     @Resource
     private TenantMapper tenantMapper;
+
     @Resource
     private TenantMapperEx tenantMapperEx;
 
+    @Value("${tenant.userNumLimit}")
+    private Integer userNumLimit;
+
+    @Value("${tenant.billsNumLimit}")
+    private Integer billsNumLimit;
+
 
     public Tenant getTenant(long id)throws Exception {
         Tenant result=null;
@@ -72,8 +81,8 @@ public class TenantService {
         Tenant tenant = JSONObject.parseObject(beanJson, Tenant.class);
         int result=0;
         try{
-            tenant.setUserNumLimit(2); //默认用户限制数量
-            tenant.setBillsNumLimit(200); //默认单据限制数量
+            tenant.setUserNumLimit(userNumLimit); //默认用户限制数量
+            tenant.setBillsNumLimit(billsNumLimit); //默认单据限制数量
             tenant.setCreateTime(new Date());
             result=tenantMapper.insertSelective(tenant);
         }catch(Exception e){
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 565d5c96..adb31994 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -16,6 +16,10 @@ mybatis.mapper-locations=classpath:./mapper_xml/*.xml
 mybatis-plus.mapper-locations=classpath:./mapper_xml/*.xml
 #租户对应的角色id
 manage.roleId=10
+#租户允许创建的用户数
+tenant.userNumLimit=5
+#租户允许创建的单据数
+tenant.billsNumLimit=200
 #插件配置
 plugin.runMode=prod
 plugin.pluginPath=plugins