diff --git a/tkdata-model-server/src/main/resources/mapper/newhosts/NewHostsMapper.xml b/tkdata-model-server/src/main/resources/mapper/newhosts/NewHostsMapper.xml index 0b9d204..4ed24d0 100644 --- a/tkdata-model-server/src/main/resources/mapper/newhosts/NewHostsMapper.xml +++ b/tkdata-model-server/src/main/resources/mapper/newhosts/NewHostsMapper.xml @@ -35,6 +35,10 @@ and ns.hosts_id like concat(#{req.hostsId,jdbcType=VARCHAR},'%') + + + and ns.hosts_kind like concat("%",#{req.hostsKind,jdbcType=VARCHAR},"%") + and ns.is_assigned =#{req.isAssigned,jdbcType=INTEGER} @@ -103,7 +107,6 @@ and ns.Invitation_type =#{req.invitationType,jdbcType=INTEGER} - group by ns.hosts_id diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml index 861ac11..2a97a81 100644 --- a/yudao-server/src/main/resources/application.yaml +++ b/yudao-server/src/main/resources/application.yaml @@ -3,7 +3,7 @@ spring: name: yudao-server profiles: - active: dev + active: local main: allow-circular-references: true # 允许循环依赖,因为项目是三层架构,无法避免这个情况。