Browse Source

'优化登录页-样式配置查询接口,优化查询语句逻辑,增加配置页信息表id字段'

james 2 years ago
parent
commit
65de105f06

+ 6 - 0
base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/vo/SysTenantConfigVo.java

@@ -23,6 +23,12 @@ public class SysTenantConfigVo implements Serializable {
 
 
     private static final long serialVersionUID=1L;
     private static final long serialVersionUID=1L;
 
 
+    /**
+     * 租户ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
     /**
     /**
      * 租户ID
      * 租户ID
      */
      */

+ 1 - 2
base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysTenantConfigMapper.xml

@@ -29,12 +29,11 @@
     </resultMap>
     </resultMap>
     <select id="getTenantConfig" resultType="com.usky.system.service.vo.SysTenantConfigVo">
     <select id="getTenantConfig" resultType="com.usky.system.service.vo.SysTenantConfigVo">
         SELECT
         SELECT
-        a.id as tenantId,ifNULL(b.login_title,a.tenant_name) as loginTitle,b.login_logo,b.login_back_url,b.login_footer,b.login_type,b.label_icon
+        b.id as id,a.id as tenantId,ifNULL(b.login_title,a.tenant_name) as loginTitle,b.login_logo,b.login_back_url,b.login_footer,b.login_type,b.label_icon
         FROM
         FROM
         sys_tenant AS a
         sys_tenant AS a
         LEFT JOIN sys_tenant_config AS b ON a.id = b.tenant_id
         LEFT JOIN sys_tenant_config AS b ON a.id = b.tenant_id
         <where>
         <where>
-
             a. STATUS = 0
             a. STATUS = 0
             AND a.domain = #{url}
             AND a.domain = #{url}
         </where>
         </where>