修改网上办理地址webapplyurl规则2

kqapi/src/main/java/com/ningdatech/kqapi/common/helper/basic/AbstractMatterCacheHelper.java

@@ -45,12 +45,17 @@ public abstract class AbstractMatterCacheHelper implements InitializingBean {
     private Boolean initMatterCache() {
         List<DscSxAdsShareItemQltQlsxCommonIDVKq> allMatters = kqService
                 .list(Wrappers.lambdaQuery(DscSxAdsShareItemQltQlsxCommonIDVKq.class)
-                .select(DscSxAdsShareItemQltQlsxCommonIDVKq::getRowguid,DscSxAdsShareItemQltQlsxCommonIDVKq::getQlName,
-                        DscSxAdsShareItemQltQlsxCommonIDVKq::getWebapplyurl)
-                .eq(DscSxAdsShareItemQltQlsxCommonIDVKq::getQlState, "1")
-                .isNotNull(DscSxAdsShareItemQltQlsxCommonIDVKq::getQlInnerCodeItem)
-                .isNotNull(DscSxAdsShareItemQltQlsxCommonIDVKq::getWebapplyurl)
-                .orderByDesc(DscSxAdsShareItemQltQlsxCommonIDVKq::getUpdateDate));
+                        .select(DscSxAdsShareItemQltQlsxCommonIDVKq::getRowguid,
+                                DscSxAdsShareItemQltQlsxCommonIDVKq::getQlName,
+                                DscSxAdsShareItemQltQlsxCommonIDVKq::getQlState,
+                                DscSxAdsShareItemQltQlsxCommonIDVKq::getQlInnerCodeItem,
+                                DscSxAdsShareItemQltQlsxCommonIDVKq::getWebapplyurl)
+                        .eq(DscSxAdsShareItemQltQlsxCommonIDVKq::getQlState, "1")
+                        .isNotNull(DscSxAdsShareItemQltQlsxCommonIDVKq::getWebapplyurl)
+                        // 确保getQlInnerCodeItem字段不为null且不为""
+                        .isNotNull(DscSxAdsShareItemQltQlsxCommonIDVKq::getQlInnerCodeItem)
+                        .ne(DscSxAdsShareItemQltQlsxCommonIDVKq::getQlInnerCodeItem, "")
+                        .orderByDesc(DscSxAdsShareItemQltQlsxCommonIDVKq::getUpdateDate));
         if (allMatters.isEmpty()) {
             log.warn("事项数据未初始化");
             return Boolean.FALSE;
@@ -132,9 +137,9 @@ public abstract class AbstractMatterCacheHelper implements InitializingBean {
                 .build(key -> {
                     DscSxAdsShareItemQltQlsxCommonIDVKq matter = kqService.getOne(Wrappers.lambdaQuery(DscSxAdsShareItemQltQlsxCommonIDVKq.class)
                             .eq(DscSxAdsShareItemQltQlsxCommonIDVKq::getQlName, key)
-                            .eq(DscSxAdsShareItemQltQlsxCommonIDVKq::getQlState, "1")
+//                            .eq(DscSxAdsShareItemQltQlsxCommonIDVKq::getQlState, "1")
+//                            .isNotNull(DscSxAdsShareItemQltQlsxCommonIDVKq::getQlInnerCodeItem)
                             .isNotNull(DscSxAdsShareItemQltQlsxCommonIDVKq::getWebapplyurl)
-                            .isNotNull(DscSxAdsShareItemQltQlsxCommonIDVKq::getQlInnerCodeItem)
                             .orderByDesc(DscSxAdsShareItemQltQlsxCommonIDVKq::getUpdateDate)
                             .last(BizConst.LIMIT_1)
                     );
@@ -142,8 +147,8 @@ public abstract class AbstractMatterCacheHelper implements InitializingBean {
                         //查不到直接返回null
                         return null;
                     }
-//                    return matter.getWebapplyurl();
-                    return "https://www.zjzwfw.gov.cn/zjservice-fe/#/workguide?localInnerCode="+ matter.getQlInnerCodeItem() +"&siteCode=330000000000";
+                    return matter.getWebapplyurl();
+//                    return "https://www.zjzwfw.gov.cn/zjservice-fe/#/workguide?localInnerCode="+ matter.getQlInnerCodeItem() +"&siteCode=330000000000";
                 });
         mattersDupCache = Caffeine.newBuilder()
                 .refreshAfterWrite(7, TimeUnit.DAYS)