代码更新

nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/rest/MenuController.java

@@ -106,7 +106,7 @@ public class MenuController {
     @GetMapping
     @ApiOperation("查询菜单")
     @SaCheckPermission("menu:list")
-    public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) throws Exception {
+    public ResponseEntity<Object> pageQuery(@RequestParam Map whereJson, Pageable page) throws Exception {
         JSONObject param = JSONObject.parseObject(JSON.toJSONString(whereJson));
         JSONObject menuDtoList = menuService.queryAll(param, page);
         return new ResponseEntity<>(menuDtoList, HttpStatus.OK);

nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/MenuServiceImpl.java

@@ -69,7 +69,7 @@ public class MenuServiceImpl implements MenuService {
 
     @Override
     public JSONObject queryAll(JSONObject param, Pageable page) throws Exception {
-        ResultBean rb = WQLObject.getWQLObject("sys_menu2").pagequery(WqlUtil.getHttpContext(page), "", "");
+        ResultBean rb = WQLObject.getWQLObject("sys_menu").pagequery(WqlUtil.getHttpContext(page), "pid is null", "");
         return rb.pageResult();
     }
 
@@ -176,7 +176,7 @@ public class MenuServiceImpl implements MenuService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void create(JSONObject form) {
-        WQLObject menuTab = WQLObject.getWQLObject("sys_menu2");
+        WQLObject menuTab = WQLObject.getWQLObject("sys_menu");
         String menu_id = IdUtil.getStringId();
         form.put("menu_id", menu_id);
         form.put("create_id", SecurityUtils.getCurrentUserId());
@@ -221,8 +221,8 @@ public class MenuServiceImpl implements MenuService {
 
     @Override
     public JSONArray getMenus(Long pid) {
-        // 菜单表【sys_menu2】
+        // 菜单表【sys_menu】
-        WQLObject menuTab = WQLObject.getWQLObject("sys_menu2");
+        WQLObject menuTab = WQLObject.getWQLObject("sys_menu");
         JSONArray menus;
         if (pid != null && !pid.equals(0L)) {
             menus = menuTab.query("pid = '" + pid + "'").getResultJSONArray(0);

nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/wql/QSYS_MENU01.wql

@@ -43,14 +43,14 @@
 	##########################################
      IF 输入.flag = "1"
         QUERY
-            SELECT system_type from sys_menu2 GROUP BY system_type
+            SELECT system_type from sys_menu GROUP BY system_type
             ENDSELECT
         ENDQUERY
      ENDIF
 
      IF 输入.flag = "2"
          QUERY
-            SELECT category from sys_menu2
+            SELECT category from sys_menu
             WHERE
             1=1
             OPTION 输入.system_type <> ""
@@ -69,7 +69,7 @@
          	(CASE WHEN rm.menu_id IS NULL THEN '0' ELSE '1' END ) AS is_checked ,
             (CASE WHEN sub_count<=0 THEN true ELSE false END ) AS leaf
          FROM
-         	sys_menu2 m
+         	sys_menu m
          	LEFT JOIN sys_roles_menus rm ON m.menu_id = rm.menu_id
          	where (pid is null or pid=0)
          	OPTION 输入.system_type <> ""