diff --git a/src/main/resources/mybatis/datasource/corpsystem/CorpMenuMapper.xml b/src/main/resources/mybatis/datasource/corpsystem/CorpMenuMapper.xml index 24f3cd6b..c21d8390 100644 --- a/src/main/resources/mybatis/datasource/corpsystem/CorpMenuMapper.xml +++ b/src/main/resources/mybatis/datasource/corpsystem/CorpMenuMapper.xml @@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SYS_MENU + SYS_MENU2 diff --git a/src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml index 7ec95e23..d8731441 100644 --- a/src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml +++ b/src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml @@ -143,6 +143,7 @@ fqp.QUALIFIED_TYPE_NAME, IFNULL( t.DEVICE_COUNT, 0 ) DEVICE_COUNT, d.`NAME` AS DEPARTMENT_NAME, + p.USER_ID, u.`NAME` AS USERNAME, r.FIRE_REGION_NAME, if(p.LATITUDE is null or p.LONGITUDE is null or p.LATITUDE = '' or p.LONGITUDE = '', '1', '0') AS ISPUNCTUATION diff --git a/src/main/resources/mybatis/datasource/system/MenuMapper.xml b/src/main/resources/mybatis/datasource/system/MenuMapper.xml index b8ffb1ba..55caf1f8 100644 --- a/src/main/resources/mybatis/datasource/system/MenuMapper.xml +++ b/src/main/resources/mybatis/datasource/system/MenuMapper.xml @@ -34,7 +34,7 @@ - SYS_MENU + SYS_MENU2