diff --git a/tkdata-model-server/src/main/resources/mapper/employeebigbrother/EmployeeBigBrotherMapper.xml b/tkdata-model-server/src/main/resources/mapper/employeebigbrother/EmployeeBigBrotherMapper.xml
index 2c1701f..ba158b5 100644
--- a/tkdata-model-server/src/main/resources/mapper/employeebigbrother/EmployeeBigBrotherMapper.xml
+++ b/tkdata-model-server/src/main/resources/mapper/employeebigbrother/EmployeeBigBrotherMapper.xml
@@ -145,8 +145,8 @@
and deleted = 0
- and deleted = 0
- or deleted = 1
+ and (deleted = 0
+ or deleted = 1)
and sbr.user_id = #{dto.userId,jdbcType=VARCHAR}
diff --git a/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml b/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml
index ba234fd..786b028 100644
--- a/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml
+++ b/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml
@@ -122,6 +122,9 @@
and ns.country = #{req.country}
+
+ and ns.hosts_kind = #{req.hostsKind,jdbcType=INTEGER}
+
and DATE(ns.create_time) =#{req.createTime}
@@ -259,8 +262,8 @@
and deleted = 0
- and deleted = 0
- or deleted = 1
+ and (deleted = 0
+ or deleted = 1)
@@ -270,6 +273,10 @@
and ci.country_group_name =#{req.region,jdbcType=VARCHAR}
+
+
+ and ns.hosts_kind = #{req.hostsKind,jdbcType=INTEGER}
+
and ns.country = #{req.country}
@@ -283,7 +290,7 @@
and DATE(ns.update_time) =#{req.updateTime}
- and operation_status =#{req.operationStatus,jdbcType=INTEGER}
+ and operation_status = #{req.operationStatus,jdbcType=INTEGER}