diff --git a/sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml index 0c4a1fd..08ef8ac 100644 --- a/sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml @@ -37,7 +37,7 @@ spring: discovery: # 服务注册地址 server-addr: 192.168.0.56:8848 - namespace: sgzb_cloud_cq_dev + namespace: sgzb_cloud_dev_cqjj config: # 配置中心地址 server-addr: 192.168.0.56:8848 diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SelectMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SelectMapper.xml index 6f27b9b..4810be2 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SelectMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SelectMapper.xml @@ -117,8 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mt.type_id ) AS subquery0 ON subquery0.type_id = mt.type_id WHERE mt.del_flag = '0' - AND mt.parent_id = #{id} - and mt.type_id != #{typeId} + AND mt.parent_id IN (SELECT type_id FROM ma_type WHERE parent_id = #{id}) and mt.level = '4'