Merge branch 'bugfix-20231201' into 'developer'

Bugfix 20231201

See merge request !1574

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatPlanOwnerLogMapper.xml

@@ -171,15 +171,13 @@
   	  		and b.name like #{searchParams}
   	  	</if>
 	  <if test="1==clerkTaskStatus">
-		  group by b.plan_id
-		  having ( notSendCount > 0  AND  b.`end_time` <![CDATA[>=]]>  NOW() )
-		  order by b.end_time desc ,  a.create_time desc
+		  and b.end_time > now()
 	  </if>
 	  <if test="2==clerkTaskStatus">
-		  group by b.plan_id
-		  having ( notSendCount = 0  or (sendCount > 0 and  b.`end_time` <![CDATA[<]]>  NOW() ) )
-		  order by b.end_time desc ,  a.create_time desc
+		  and b.end_time <![CDATA[<=]]> now()
 	  </if>
+	  group by b.plan_id
+	  order by b.end_time desc ,  a.create_time desc
   </select>
   
   <select id="listOwnerLogPageForWxa"  parameterType="com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO" resultType="com.gic.haoban.manage.api.dto.chat.GroupChatPlanOwnerLogDTO">

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/TestController.java

@@ -511,13 +511,13 @@ public class TestController extends WebBaseController {
             return "wu" ;
         }
         List<String> list = new ArrayList<>();
-        String url = dto.getUrlHost() ;
+        String url = dto.getUrlHost().split("#")[0] ;
         String cop = dto.getWxCorpid() ;
         SecretSettingDTO s =  this.secretSettingApiService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.SELF_APP.getVal()) ;
         
         String token = this.qywxCorpApiService.getToken(cop, s.getSecretVal()) ;
-        String ip = url.replace("http://", "").replace(":8960","").replace(":8990","") ;
-        
+        String ip =  dto.getUrlHost().split("#")[1] ;
+
         String selfUrl = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/get_corp_tag_list?access_token=" + token;
         url = url+"/api-qywx-self/qywx/self-post?ip=" + ip + "&url="
                 + URLEncoder.encode(selfUrl, "utf-8");