一键群发问题

fs-service/src/main/java/com/fs/qw/mapper/QwUserMapper.java

@@ -44,7 +44,7 @@ public interface QwUserMapper extends BaseMapper<QwUser>
 
     public List<QwUser> batchGetQwUser(@Param("list") List<QwUserKeyDTO> qwUserId);
 
-    @Select("select welcome_text,qw_user_name from qw_user where id = #{id}")
+    @Select("select company_user_id,company_id,welcome_text,qw_user_name from qw_user where id = #{id}")
     public QwUser selectQwUserByIdByWeComeText(@Param("id") Long id);
 
     @Select("select * from qw_user where qw_user_id = #{qwUserId} and corp_id = #{corpId} ")

fs-service/src/main/java/com/fs/sop/service/impl/SopUserLogsInfoServiceImpl.java

@@ -669,6 +669,14 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
             if (StringUtils.isEmpty(domainName)){
                 domainName = config.getRealLinkDomainName();
             }
+
+            QwCompany qwCompany = iQwCompanyService.getQwCompanyByRedis(param.getCorpId());
+
+            if (qwCompany == null ) {
+                return  R.error().put("msg","企业不存在，请联系管理员");
+            }
+
+
             String finalDomainName = domainName;
             sopUserLogsInfos.forEach(item->{
 
@@ -751,14 +759,14 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
                             String linkByMiniApp = createLinkByMiniApp(st, param.getCorpId(), createTime, param.getCourseId(), param.getVideoId(),
                                     qwUserId, companyUserId, companyId, item.getExternalId(), config);
 
-                            if (StringUtil.strIsNullOrEmpty(config.getMiniprogramAppid())){
-                                log.error("配置中无小程序id，采用默认的");
-                                st.setMiniprogramAppid("wxc84c6f789ba7f176");
+                            if (StringUtil.strIsNullOrEmpty(qwCompany.getMiniAppId())){
+                                log.error("企业未配置小程序-"+param.getCorpId());
                             }else {
-                                st.setMiniprogramAppid(config.getMiniprogramAppid());
+                                //置换各自的小程序
+                                st.setMiniprogramAppid(qwCompany.getMiniAppId());
                             }
-
                             st.setMiniprogramPage(linkByMiniApp);
+
                             break;
                         //app
                         case "9":