给租户增加有效期

jshERP-boot/src/main/resources/application.properties

@@ -18,6 +18,8 @@ spring.redis.password=1234abcd
 manage.roleId=10
 #租户允许创建的用户数
 tenant.userNumLimit=1000000
+#租户允许试用的天数
+tenant.tryDayLimit=3000
 #演示模式开关-默认关闭:false
 demonstrate.open=false
 #插件配置

jshERP-boot/src/main/resources/mapper_xml/TenantMapperEx.xml

@@ -13,6 +13,12 @@
             <bind name="bindLoginName" value="'%'+loginName+'%'"/>
             and login_name like #{bindLoginName}
         </if>
+        <if test="type != null and type != ''">
+            and type = #{type}
+        </if>
+        <if test="enabled != null and enabled != ''">
+            and enabled = #{enabled}
+        </if>
         order by id desc
         <if test="offset != null and rows != null">
             limit #{offset},#{rows}
@@ -27,5 +33,11 @@
             <bind name="bindLoginName" value="'%'+loginName+'%'"/>
             and login_name like #{bindLoginName}
         </if>
+        <if test="type != null and type != ''">
+            and type = #{type}
+        </if>
+        <if test="enabled != null and enabled != ''">
+            and enabled = #{enabled}
+        </if>
     </select>
 </mapper>