Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmAddressService.java

@@ -108,7 +108,7 @@ public class KwmAddressService {
         }
 
         if (Objects.nonNull(reqVo.getEndTime())) {
-            wrapper.lt(KwmAddress::getCreateTime, DateUtil.offsetDay(reqVo.getEndTime(), 1));
+            wrapper.le(KwmAddress::getCreateTime, reqVo.getEndTime());
         }
 
         if (StringUtils.isNotBlank(reqVo.getIds())) {

sckw-modules/sckw-system/src/main/resources/mapper/KwsEnterpriseDao.xml

@@ -215,11 +215,10 @@
     </select>
 
   <select id="selectByKeys" resultType="com.sckw.system.model.KwsEnterprise">
-    select
-    <include refid="Base_Column_List" />
-    from kws_enterprise
+    select a.*
+    from kws_enterprise a
     where del_flag = 0
-    and approval = 1
+      and exists( select 1 from kws_ent_check_track b where a.id = b.ent_id and b.status = 0)
     <if test="list != null and list.size() > 0">
       and id in
       <foreach collection="list" item="item" open="(" close=")" separator=",">