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

sckw-auth/src/main/java/com/sckw/auth/model/vo/res/LoginResVo1.java

@@ -116,8 +116,14 @@ public class LoginResVo1 implements Serializable {
      */
     private String token;
 
+    /**
+     * 机构id
+     */
     private Long deptId;
 
+    /**
+     * 岗位角色id
+     */
     private Long roleId;
 
 }

sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/DateUtils.java

@@ -717,4 +717,28 @@ public class DateUtils extends DateUtil {
         DateTimeFormatter fmt = DateTimeFormatter.ofPattern(pattern);
         return date.format(fmt);
     }
+
+    /**
+     * @desc: localDate转换为date 开始时间
+     * @author: yzc
+     * @date: 2023-09-27 9:52
+     * @Param localDate:
+     * @return: java.util.Date
+     */
+    public static Date localDateToDateStart(LocalDate localDate) {
+        LocalDateTime time = LocalDateTime.of(localDate, LocalTime.MIN);
+        return formatDate(time);
+    }
+
+    /**
+     * @desc: localDate转换为date 结束时间
+     * @author: yzc
+     * @date: 2023-09-27 9:52
+     * @Param localDate:
+     * @return: java.util.Date
+     */
+    public static Date localDateToDateEnd(LocalDate localDate) {
+        LocalDateTime time = LocalDateTime.of(localDate, LocalTime.MAX);
+        return formatDate(time);
+    }
 }

sckw-modules/sckw-operation/src/main/java/com/sckw/operation/service/BannerService.java

@@ -146,7 +146,7 @@ public class BannerService {
         Long userId = LoginUserHolder.getUserId();
         Date date = new Date();
         kwoBanner.setDelFlag(Global.NO);
-        kwoBanner.setStatus(Global.NO);
+        kwoBanner.setStatus(reqVo.getStatus());
         kwoBanner.setCreateBy(userId);
         kwoBanner.setUpdateBy(userId);
         kwoBanner.setCreateTime(date);

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

@@ -320,7 +320,7 @@
     <select id="queryEntInfoByCityCodeAndEntTypesWithPage" resultType="com.sckw.system.model.KwsEnterprise">
       SELECT a.*
         FROM kws_enterprise a
-             LEFT JOIN sys_area b ON a.city_code = b.CODE
+        LEFT JOIN sys_area b ON a.city_code = b.CODE
       where 1 = 1
         <if test="cityCode != null">
           and (b.code = #{cityCode} or b.province_code = #{cityCode} or b.pcode = #{cityCode})
@@ -342,6 +342,12 @@
                             #{item}
                          </foreach>
                     )
+        and exists (
+                    select 1
+                      from kws_ent_check_track e
+                     where a.id = e.ent_id
+                       and a.status = 0
+                )
     </select>
 
   <select id="findManageInfoByEntIds" resultType="com.sckw.system.model.pojo.FindManagePojo">