Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer

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

@@ -306,6 +306,9 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
 
     @Override
     public List<String> listWxUserIdByClerkIds(List<String> clerkList, String wxEnterpriseId) {
+        if (CollectionUtils.isEmpty(clerkList)) {
+            return null;
+        }
         return mapper.listWxUserIdByClerkIds(clerkList, wxEnterpriseId);
     }
 

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

@@ -364,6 +364,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
                 refId = dataForHmLink.getLinkId();
                 unionid = dataForHmLink.getUnionid();
                 wxUserAddLogQDTO.setLinkId(refId);
+                wxUserAddLogQDTO.setHmId(dataForHmLink.getHmId());
             }
         }