Merge remote-tracking branch 'origin/v0.0.1-day-subject' into dev

src/main/java/com/tanpu/feo/feojob/jobs/DaySubJob.java

@@ -107,8 +107,7 @@ public class DaySubJob {
         // 查询 机构配置信息
         OrgExtEntity orgExtEntity = orgExtMapper.selectOne(new LambdaQueryWrapper<OrgExtEntity>()
                 .eq(OrgExtEntity::getOrgId, orgId)
-                .eq(OrgExtEntity::getDeleteTag, BizStatus.DeleteTag.tag_init_str)
-                .last("limit 1"));
+                .eq(OrgExtEntity::getDeleteTag, BizStatus.DeleteTag.tag_init_str));
         String jsonKey = ObjectUtil.isNotNull(orgExtEntity) ? orgExtEntity.getJsonWxcpKey() : null;
         if (StringUtils.isBlank(jsonKey)) {
             return;
@@ -155,8 +154,7 @@ public class DaySubJob {
                     if (StrUtil.isNotBlank(agentId) && StrUtil.isNotBlank(corpId) && StrUtil.isNotBlank(wxcpUId) && StrUtil.isNotBlank(JSONUtil.toJsonStr(parmMap))) {
                         feignClientForWxCp.sendMessage(agentId, corpId, wxcpUId, JSONUtil.toJsonStr(parmMap));
                     }
-                }
-                if (StringUtils.isNotBlank(wxOpenId)) {
+                }else if (StringUtils.isNotBlank(wxOpenId)) {
                     // 2 公众号推送
                     String wxAppID = jsonKeyInfo.getStr("sendMessageAppId");
                     // ww=wxAppID&orgCode=orgCode