zyp

fs-service-system/src/main/java/com/fs/wx/miniapp/config/WxMaConfiguration.java

@@ -46,7 +46,6 @@ public class WxMaConfiguration {
     }*/
     @Autowired
     public WxMaConfiguration(SysConfigMapper sysConfigMapper) {
-
         WxMaProperties wx = new WxMaProperties();
         List<WxMaProperties.Config> c = new ArrayList<>();
         //看课小程序加载

fs-service-system/src/main/resources/application-config-zkzh.yml

@@ -86,8 +86,8 @@ wx:
         token: Ncbnd7lJvkripVOpyTFAna6NAWCxCrvC
         aesKey: HlEiBB55eaWUaeBVAQO3cWKWPYv1vOVQSq7nFNICw4E
         msgDataFormat: JSON
-      - appid: wxf1be66e6db43bd33   #中康智慧坊  郭明顺
-        secret: 488ad9e9729a18673b1d928f3d1976b0
+      - appid: wxdf9b1a4d3c5b6572   #中康智慧坊
+        secret: 489055ace816380c0fceb53447381704
         token: Ncbnd7lJvkripVOpyTFAna6NAWCxCrvC
         aesKey: HlEiBB55eaWUaeBVAQO3cWKWPYv1vOVQSq7nFNICw4E
         msgDataFormat: JSON

fs-service-system/src/main/resources/mapper/course/FsUserCourseVideoMapper.xml

@@ -313,7 +313,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND ccut.course_id = fcpd.course_id
             AND ccut.video_id = fcpd.video_id
             AND ccut.company_user_id = #{params.companyUserId}
-        where course.is_del = 0
+        where course.is_del = 0 and fcpd.del_flag ='0'
         <if test="params.companyId != null">
             and FIND_IN_SET(#{params.companyId}, fcp.company_id)
         </if>

fs-user-app/src/main/java/com/fs/app/controller/WxH5MpController.java

@@ -201,7 +201,6 @@ public class WxH5MpController {
                 return R.error("获取用户信息失败," + e.getMessage());
             }
         }
-
     }
     private void handleFsUserWx(FsUser user, FsUserLoginByMpParam param, WxMaJscode2SessionResult session) {
         if (user == null) return;
@@ -210,7 +209,7 @@ public class WxH5MpController {
                 .eq(FsUserWx::getFsUserId, user.getUserId())
                 .eq(FsUserWx::getAppId, param.getAppId())
                 .eq(FsUserWx::getOpenId, session.getOpenid())
-                .set(FsUserWx::getCompanyId, user.getCompanyId())
+//                .set(FsUserWx::getCompanyId, user.getCompanyId())
                 .set(FsUserWx::getUnionId, session.getUnionid() == null ? "" : session.getUnionid())
                 .set(FsUserWx::getUpdateTime, new Date())
                 .update();
@@ -220,7 +219,7 @@ public class WxH5MpController {
             FsUserWx fsUserWx = new FsUserWx();
             fsUserWx.setType(1);
             fsUserWx.setFsUserId(user.getUserId());
-            fsUserWx.setCompanyId(user.getCompanyId());
+//            fsUserWx.setCompanyId(user.getCompanyId());
             fsUserWx.setAppId(param.getAppId());
             fsUserWx.setOpenId(session.getOpenid());
             fsUserWx.setUnionId(session.getUnionid() == null ? "" : session.getUnionid());