Merge branch 'feature/xgh/202506迭代' into 'developer'

Feature/xgh/202506迭代

See merge request !2995

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

@@ -78,5 +78,5 @@ public interface HandoverExternalMapper {
      */
     List<HandoverStaffFriendCountDTO> listPreCountByStaffIds(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffIds") List<String> staffIds);
 
-    List<HandoverExternalDTO> listAllByStaffIds(@Param("wxEnterpriseId") String wxEnterpriseId,  @Param("staffIds") List<String> staffIds, @Param("search") String search, @Param("status") Integer status);
+    List<TabHandoverExternal> listAllByStaffIds(@Param("wxEnterpriseId") String wxEnterpriseId,  @Param("staffIds") List<String> staffIds, @Param("search") String search, @Param("status") Integer status);
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmLinkServiceImpl.java

@@ -78,12 +78,12 @@ public class HmLinkServiceImpl implements HmLinkService {
     public HmLinkBO getByLinkShortCodeCache(String shortCode) {
         String key = "hm:link:" + shortCode;
         HmLinkBO link = RedisUtil.getCache(key, HmLinkBO.class);
-        //if (link == null) {
+        if (link == null) {
             link = this.getByLinkShortCode(shortCode);
             if (link != null) {
                 RedisUtil.setCache(key, link, 20 * 60L);
             }
-       // }
+        }
         return link;
     }
 

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

@@ -9,6 +9,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import com.gic.commons.util.EntityUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -245,8 +246,12 @@ public class HandoverServiceImpl implements HandoverService {
 
     @Override
     public List<HandoverExternalDTO> listAllByStaffIds(String wxEnterpriseId, String search, List<String> staffIds) {
-        List<HandoverExternalDTO> retList = handoverExternalMapper.listAllByStaffIds(wxEnterpriseId, staffIds , search , 1);
-        return retList;
+        List<TabHandoverExternal> list = handoverExternalMapper.listAllByStaffIds(wxEnterpriseId, staffIds , search , 1);
+        if(null != list) {
+            List<HandoverExternalDTO> retList = EntityUtil.changeEntityListByJSON(HandoverExternalDTO.class, list) ;
+            return retList;
+        }
+        return new ArrayList<>() ;
     }
 
     @Override