Merge branch 'feature/xgh/202503' into 'developer'

好办小程序查询返回多条

See merge request !2755

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabMiniprogramSettingMapper.java

@@ -56,5 +56,5 @@ public interface TabMiniprogramSettingMapper {
      * @param appId
      * @return
      */
-    public TabMiniprogramSetting getMiniprogramSettingByAppId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("appId") String appId);
+    public List<TabMiniprogramSetting> getMiniprogramSettingByAppId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("appId") String appId);
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MiniprogramSettingServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Objects;
 
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanWelcomeMediaMapper;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -144,6 +145,10 @@ public class MiniprogramSettingServiceImpl implements MiniprogramSettingService
 
     @Override
     public TabMiniprogramSetting getMiniprogramSettingByAppId(String wxEnterpriseId, String appId) {
-        return tabMiniprogramSettingMapper.getMiniprogramSettingByAppId(wxEnterpriseId, appId);
+        List<TabMiniprogramSetting> list = tabMiniprogramSettingMapper.getMiniprogramSettingByAppId(wxEnterpriseId, appId);
+        if(CollectionUtils.isNotEmpty(list)) {
+            return list.get(0) ;
+        }
+        return null ;
     }
 }