Administrator 4 жил өмнө
parent
commit
8660307fe9

+ 1 - 1
boman-modules/boman-gen/src/main/java/com/boman/gen/service/GenTableServiceImpl.java

@@ -557,7 +557,7 @@ public class GenTableServiceImpl implements IGenTableService {
      * @param genTable
      */
     public void isMenu(GenTable genTable, BusinessType type) {
-        String tableName = genTable.getTableName();
+        String tableName = StringUtils.trim(genTable.getTableName());
         if (type.equals(BusinessType.UPDATE)) {
             //先查询之前是否是菜单
             GenTable genTableOld = genTableMapper.selectGenTableById(genTable.getId());

+ 2 - 1
boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysMenuServiceImpl.java

@@ -137,8 +137,10 @@ public class SysMenuServiceImpl implements ISysMenuService {
     public List<SysMenu> selectMenuTreeByUserId(Long userId) {
         List<SysMenu> menus = null;
         if (SecurityUtils.isAdmin(userId)) {
+            //查询所有不能过滤
             menus = menuMapper.selectMenuTreeAll();
         } else {
+            //查询所有不能过滤状态
             menus = menuMapper.selectMenuTreeByUserId(userId);
         }
         return getChildPerms(menus, 0);
@@ -708,7 +710,6 @@ public class SysMenuServiceImpl implements ISysMenuService {
      * 功能描述: 找到sonMenus对应的所有的父类,结果存放于result中
      *
      * @param allMenus allMenus
-     * @param sonMenus sonMenus
      * @param result   没有按照规则排序只是把父类全部存放于result中
      */
     @Override

+ 1 - 1
boman-modules/boman-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -56,7 +56,7 @@
 	
 	<select id="selectMenuTreeAll" resultMap="SysMenuResult">
 		select distinct m.id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time, m.create_by, m.update_by, m.update_time, m.remark, m.sys_table_name
-		from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0
+		from sys_menu m where m.menu_type in ('M', 'C')
 		order by m.parent_id, m.order_num
 	</select>