查询所有的菜单数据接口修改：加上操作项

gic-platform-auth-api/src/main/java/com/gic/auth/qo/MenuListQO.java

@@ -23,6 +23,7 @@ public class MenuListQO extends PageQO{
      * 0:页面 1：权限项 2：操作项
      */
     private Integer menuType;
+    private List<Integer> menuTypeList;
     /**
      * 层级
      */
@@ -136,4 +137,13 @@ public class MenuListQO extends PageQO{
         this.platformType = platformType;
         return this;
     }
+
+    public List<Integer> getMenuTypeList() {
+        return menuTypeList;
+    }
+
+    public MenuListQO setMenuTypeList(List<Integer> menuTypeList) {
+        this.menuTypeList = menuTypeList;
+        return this;
+    }
 }

gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/MenuApiServiceImpl.java

@@ -239,7 +239,10 @@ public class MenuApiServiceImpl implements MenuApiService {
         //超级管理员
         MenuListQO params = new MenuListQO();
         //查询gic的菜单
-        params.setMenuType(MenuTypeEnum.PAGE.getCode());
+        List<Integer> menuTypeList = new ArrayList<>(2);
+        menuTypeList.add(MenuTypeEnum.PAGE.getCode());
+        menuTypeList.add(MenuTypeEnum.OPERATION.getCode());
+        params.setMenuTypeList(menuTypeList);
         List<MenuDTO> result = EntityUtil.changeEntityListNew(MenuDTO.class, this.menuService.listMenu(params));
         return ServiceResponse.success(result);
     }

gic-platform-auth-service/src/main/resources/mapper/TabSysMenuMapper.xml

@@ -320,7 +320,7 @@
     <if test="menuType != null">
       and menu_type = #{menuType}
     </if>
-    <if test="menuType == null">
+    <if test="menuType == null and menuTypeList == null">
       and menu_type != 2
     </if>
     <if test="level != null">
@@ -341,6 +341,12 @@
         #{item}
       </foreach>
     </if>
+    <if test="menuTypeList != null and menuTypeList.size() > 0">
+      and menu_type in
+      <foreach close=")" collection="menuTypeList" index="index" item="item" open="(" separator=",">
+        #{item}
+      </foreach>
+    </if>
 
     order by level,sort
   </select>