走ipad 主备的 但是又不走评级的 全改走默认

fs-qw-task/src/main/java/com/fs/app/taskService/impl/SopLogsTaskServiceImpl.java

@@ -955,8 +955,14 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
                                 CompanyMiniapp companyMiniapp = miniapps.get(0);
                                 if (companyMiniapp != null && !StringUtil.strIsNullOrEmpty(companyMiniapp.getAppId())) {
                                     setting.setMiniprogramAppid(companyMiniapp.getAppId());
+                                }else if (!StringUtil.strIsNullOrEmpty(miniAppId)){
+                                    setting.setMiniprogramAppid(miniAppId);
                                 }
+                            }else if (!StringUtil.strIsNullOrEmpty(miniAppId)){
+                                setting.setMiniprogramAppid(miniAppId);
                             }
+                        }else if (!StringUtil.strIsNullOrEmpty(miniAppId)){
+                            setting.setMiniprogramAppid(miniAppId);
                         }
                     }else if (!StringUtil.strIsNullOrEmpty(miniAppId)){
                         setting.setMiniprogramAppid(miniAppId);

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

@@ -851,8 +851,14 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
                                         CompanyMiniapp companyMiniapp = miniapps.get(0);
                                         if (companyMiniapp != null && !StringUtil.strIsNullOrEmpty(companyMiniapp.getAppId())) {
                                             st.setMiniprogramAppid(companyMiniapp.getAppId());
+                                        }else if (!StringUtil.strIsNullOrEmpty(qwCompany.getMiniAppId())){
+                                            st.setMiniprogramAppid(qwCompany.getMiniAppId());
                                         }
+                                    }else if (!StringUtil.strIsNullOrEmpty(qwCompany.getMiniAppId())){
+                                        st.setMiniprogramAppid(qwCompany.getMiniAppId());
                                     }
+                                }else if (!StringUtil.strIsNullOrEmpty(qwCompany.getMiniAppId())){
+                                    st.setMiniprogramAppid(qwCompany.getMiniAppId());
                                 }
                             } else if (!StringUtil.strIsNullOrEmpty(qwCompany.getMiniAppId())) {
                                 st.setMiniprogramAppid(qwCompany.getMiniAppId());
@@ -1207,14 +1213,6 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
                     String linkByMiniApp = createLinkByMiniApp(st, param.getCorpId(), dataTime, param.getCourseId(), param.getVideoId(),
                             String.valueOf(qwUser.getId()), companyUserId, companyId, item.getExternalId(), config);
 
-//                    if (StringUtil.strIsNullOrEmpty(config.getMiniprogramAppid())){
-//
-//                        log.error("配置中无小程序id，采用默认的");
-//
-//                        st.setMiniprogramAppid("wxc84c6f789ba7f176");
-//                    }else {
-//                        st.setMiniprogramAppid(config.getMiniprogramAppid());
-//                    }
                     if (!miniMap.isEmpty() && qwUser.getSendMsgType() == 1) {
                         Map<Integer, List<CompanyMiniapp>> integerListMap = miniMap.get(Long.valueOf(companyId));
                         if (integerListMap != null) {
@@ -1227,13 +1225,19 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
                                 CompanyMiniapp companyMiniapp = miniapps.get(0);
                                 if (companyMiniapp != null && !StringUtil.strIsNullOrEmpty(companyMiniapp.getAppId())) {
                                     st.setMiniprogramAppid(companyMiniapp.getAppId());
+                                }else if (!StringUtil.strIsNullOrEmpty(qwCompany.getMiniAppId())){
+                                    st.setMiniprogramAppid(qwCompany.getMiniAppId());
                                 }
+                            }else if (!StringUtil.strIsNullOrEmpty(qwCompany.getMiniAppId())){
+                                st.setMiniprogramAppid(qwCompany.getMiniAppId());
                             }
+                        }else if (!StringUtil.strIsNullOrEmpty(qwCompany.getMiniAppId())){
+                            st.setMiniprogramAppid(qwCompany.getMiniAppId());
                         }
                     } else if (!StringUtil.strIsNullOrEmpty(qwCompany.getMiniAppId())) {
                         st.setMiniprogramAppid(qwCompany.getMiniAppId());
                     } else {
-                        log.error("企业未配置小程序-" + param.getCorpId());
+                        log.error("公司的小程序id为空：采用了前端传的固定值" + param.getCorpId());
                     }
 
                     st.setMiniprogramPage(linkByMiniApp);