nm-project
/
aiccs-api
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
lwd 2026-01-04 20:28:42 +08:00
parent 19c793509b 5c03ba30c4
commit 9cd671dc78
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
aiceps-service-server-menu.sql
View File

@ -7,21 +7,21 @@ set REMARK = '12'
where SYSMENUID='74ad1a52-a1b8-456b-a3e7-3249d69a1d50';
-- 新增菜单
INSERT INFO SYS_MENU(SYSMENUID,SYSMENUTYPEID,MENUTYPEID,SYSMENUNAME,SYSMENUFILED,RESOURCEURL,PARENTID,REMARK,ORGLEVEL,RESOURCETYPE,SYSINDEX)
INSERT INTO SYS_MENU(SYSMENUID,SYSMENUTYPEID,MENUTYPEID,SYSMENUNAME,SYSMENUFILED,RESOURCEURL,PARENTID,REMARK,ORGLEVEL,RESOURCETYPE,SYSINDEX)
VALUES('6b6649ec-86a5-4424-b7af-d542af33bc26','1','resource','年报主体精准监管','NBFW','/aiceps-service-web','','10',1,null,99);
INSERT INFO SYS_MENU(SYSMENUID,SYSMENUTYPEID,MENUTYPEID,SYSMENUNAME,SYSMENUFILED,RESOURCEURL,PARENTID,REMARK,ORGLEVEL,RESOURCETYPE,SYSINDEX)
INSERT INTO SYS_MENU(SYSMENUID,SYSMENUTYPEID,MENUTYPEID,SYSMENUNAME,SYSMENUFILED,RESOURCEURL,PARENTID,REMARK,ORGLEVEL,RESOURCETYPE,SYSINDEX)
VALUES('5dbd7970-ffc7-40ac-aa33-f787c90c2e19','1','resource','精细化分级管理','NBFW:JXH','/fineClassificated/jingXiHuaFenxJiGuanLi','6b6649ec-86a5-4424-b7af-d542af33bc26','0',2,null,99);
INSERT INFO SYS_MENU(SYSMENUID,SYSMENUTYPEID,MENUTYPEID,SYSMENUNAME,SYSMENUFILED,RESOURCEURL,PARENTID,REMARK,ORGLEVEL,RESOURCETYPE,SYSINDEX)
INSERT INTO SYS_MENU(SYSMENUID,SYSMENUTYPEID,MENUTYPEID,SYSMENUNAME,SYSMENUFILED,RESOURCEURL,PARENTID,REMARK,ORGLEVEL,RESOURCETYPE,SYSINDEX)
VALUES('d1244741-47bb-4fc1-869d-875917d85497','1','resource','主体分类管理','NBFW:JXH:JTFL','/index','5dbd7970-ffc7-40ac-aa33-f787c90c2e19','0',3,null,99);
INSERT INFO SYS_MENU(SYSMENUID,SYSMENUTYPEID,MENUTYPEID,SYSMENUNAME,SYSMENUFILED,RESOURCEURL,PARENTID,REMARK,ORGLEVEL,RESOURCETYPE,SYSINDEX)
INSERT INTO SYS_MENU(SYSMENUID,SYSMENUTYPEID,MENUTYPEID,SYSMENUNAME,SYSMENUFILED,RESOURCEURL,PARENTID,REMARK,ORGLEVEL,RESOURCETYPE,SYSINDEX)
VALUES('cee33480-ddda-452f-8ce2-eab0d7438561','1','resource','分时段年报申报管理','NBFW:JXH:SBGL','/fenShiDuanNianBaoShenBao','5dbd7970-ffc7-40ac-aa33-f787c90c2e19','1',3,null,99);
INSERT INFO SYS_MENU(SYSMENUID,SYSMENUTYPEID,MENUTYPEID,SYSMENUNAME,SYSMENUFILED,RESOURCEURL,PARENTID,REMARK,ORGLEVEL,RESOURCETYPE,SYSINDEX)
INSERT INTO SYS_MENU(SYSMENUID,SYSMENUTYPEID,MENUTYPEID,SYSMENUNAME,SYSMENUFILED,RESOURCEURL,PARENTID,REMARK,ORGLEVEL,RESOURCETYPE,SYSINDEX)
VALUES('61e74b93-09e7-4011-af4e-02d04a0ced70','1','resource','年报统一管理','NBFW:TYGL','/annualReportService/unifiedMGT','6b6649ec-86a5-4424-b7af-d542af33bc26','1',2,null,99);
INSERT INFO SYS_MENU(SYSMENUID,SYSMENUTYPEID,MENUTYPEID,SYSMENUNAME,SYSMENUFILED,RESOURCEURL,PARENTID,REMARK,ORGLEVEL,RESOURCETYPE,SYSINDEX)
INSERT INTO SYS_MENU(SYSMENUID,SYSMENUTYPEID,MENUTYPEID,SYSMENUNAME,SYSMENUFILED,RESOURCEURL,PARENTID,REMARK,ORGLEVEL,RESOURCETYPE,SYSINDEX)
VALUES('0f0653e7-a82b-4c84-9d2f-f3b635a9af71','1','resource','年报进度查询','NBFW:TYGL:JDCX','/annualReportProgress','61e74b93-09e7-4011-af4e-02d04a0ced70','0',3,null,99);
INSERT INFO SYS_MENU(SYSMENUID,SYSMENUTYPEID,MENUTYPEID,SYSMENUNAME,SYSMENUFILED,RESOURCEURL,PARENTID,REMARK,ORGLEVEL,RESOURCETYPE,SYSINDEX)
INSERT INTO SYS_MENU(SYSMENUID,SYSMENUTYPEID,MENUTYPEID,SYSMENUNAME,SYSMENUFILED,RESOURCEURL,PARENTID,REMARK,ORGLEVEL,RESOURCETYPE,SYSINDEX)
VALUES('e07d48e6-a29b-4581-820e-5c07579b6abd','1','resource','年报申报提醒管理','NBFW:TYGL:SBTX','/nianBaoFenXi','61e74b93-09e7-4011-af4e-02d04a0ced70','1',3,null,99);
INSERT INFO SYS_MENU(SYSMENUID,SYSMENUTYPEID,MENUTYPEID,SYSMENUNAME,SYSMENUFILED,RESOURCEURL,PARENTID,REMARK,ORGLEVEL,RESOURCETYPE,SYSINDEX)
INSERT INTO SYS_MENU(SYSMENUID,SYSMENUTYPEID,MENUTYPEID,SYSMENUNAME,SYSMENUFILED,RESOURCEURL,PARENTID,REMARK,ORGLEVEL,RESOURCETYPE,SYSINDEX)
VALUES('7c3b2d1d-53f5-4dbe-a987-a8d412e0546e','1','resource','年报分析','NBFW:TYGL:NBFX','/qiYeCuiBao','61e74b93-09e7-4011-af4e-02d04a0ced70','2',3,null,99);
-- 账号授权

2
src/main/java/com/chinaweal/aiccs/org/controller/TUsermenuController.java
View File

@ -182,7 +182,7 @@ public class TUsermenuController extends BaseController {
userMenusDto.setPath(sysMenu.getResourceURL());
userMenusDto.setLevel(sysMenu.getOrgLevel());
userMenusDto.setChildren(new ArrayList<UserMenusDto>());
if (StringUtils.isNotEmpty(sysMenu.getRemark())) {
if (StringUtils.isNotEmpty(sysMenu.getRemark()) && StringUtils.isNumeric(sysMenu.getRemark())) {
userMenusDto.setNo(Integer.valueOf(sysMenu.getRemark()));
} else {
userMenusDto.setNo(0);