Commit 8bbd7d33 by fengshuonan

修复一些细节问题

parent dc838906
......@@ -27,7 +27,7 @@ layui.use(['layer', 'form', 'ztree', 'laydate', 'admin', 'ax', 'table', 'treetab
return [[
{type: 'numbers'},
{field: 'menuId', hide: true, sort: true, title: 'id'},
{field: 'name', align: "center", sort: true, title: '菜单名称', minWidth: 240},
{field: 'name', align: "left", sort: true, title: '菜单名称', minWidth: 240},
{field: 'code', align: "center", sort: true, title: '菜单编号', minWidth: 120},
{field: 'pcode', align: "center", sort: true, title: '菜单父编号'},
{field: 'url', align: "center", sort: true, title: '请求地址'},
......@@ -128,9 +128,7 @@ layui.use(['layer', 'form', 'ztree', 'laydate', 'admin', 'ax', 'table', 'treetab
treeColIndex: 2,
treeSpid: "0",
treeIdName: 'code',
treePidName: 'pcode',
treeDefaultClose: false,
treeLinkage: true
treePidName: 'pcode'
});
};
......
......@@ -21,6 +21,7 @@ import cn.stylefeng.guns.base.db.context.SqlSessionFactoryContext;
import cn.stylefeng.guns.base.db.exception.DataSourceInitException;
import cn.stylefeng.roses.core.config.properties.DruidProperties;
import cn.stylefeng.roses.core.mutidatasource.mybatis.OptionalSqlSessionTemplate;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.session.SqlSessionFactory;
import org.springframework.beans.factory.annotation.Qualifier;
......@@ -77,6 +78,9 @@ public class SqlSessionFactoryConfig {
//初始化其他数据源的SqlSessionFactory的容器
SqlSessionFactoryContext.initBaseSqlSessionFactory(sqlSessionFactoryCreator);
//设置SqlHelper为主数据源
SqlHelper.FACTORY = sqlSessionFactoryPrimary;
return new OptionalSqlSessionTemplate(sqlSessionFactoryPrimary, SqlSessionFactoryContext.getSqlSessionFactorys());
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment