Merge branch 'master' into 企微聊天

fs-service/src/main/resources/application-config-druid-hdt.yml

@@ -67,7 +67,8 @@ fs :
   h5CommonApi: http://119.29.195.254:8010
   jwt:
     # 加密秘钥
-    secret: f4e2e52034348f86b67cde581c0f9eb5
+#    secret: f4e2e52034348f86b67cde581c0f9eb5
+    secret: hdt-zxqzbl
     # token有效时长，7天，单位秒
     expire: 31536000
     header: AppToken

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

@@ -136,7 +136,7 @@ fs:
   commonApi: http://172.21.76.167:8010
   jwt:
     # 加密秘钥
-    secret: f4e2e52034348f86b67cde581c0f9eb5
+    secret: zkzh-zxqzbl
     # token有效时长，7天，单位秒
     expire: 31536000
     header: AppToken

fs-service/src/main/resources/mapper/his/FsPackageMapper.xml

@@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectIcdNameByPackageId" resultType="java.lang.String">
         SELECT i.icd_name
         FROM fs_package p
-                 LEFT JOIN fs_icd i ON FIND_IN_SET(i.icd_code, p.icd_code) > 0
+                 inner join fs_icd i ON FIND_IN_SET(i.icd_code, p.icd_code) > 0
         WHERE package_id = #{packageId}
     </select>
 

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

@@ -112,11 +112,11 @@ public class WxH5MpController {
             // 处理用户信息
             FsUser user = processUserInfo(wxMpUser, company,companyUser,param);
 
-            // 检查用户是否已绑定其他销售
-            FsUserCompanyUser userCompanyUser = userCompanyUserService.selectByUserIdAndProjectId(user.getUserId(), param.getProjectId());
-            if (Objects.nonNull(userCompanyUser) && !param.getCompanyUserId().equals(userCompanyUser.getCompanyUserId())){
-                return R.error(500, "该用户("+user.getUserId() + ")已成为其他销售会员");
-            }
+//            // 检查用户是否已绑定其他销售
+//            FsUserCompanyUser userCompanyUser = userCompanyUserService.selectByUserIdAndProjectId(user.getUserId(), param.getProjectId());
+//            if (Objects.nonNull(userCompanyUser) && !param.getCompanyUserId().equals(userCompanyUser.getCompanyUserId())){
+//                return R.error(500, "该用户("+user.getUserId() + ")已成为其他销售会员");
+//            }
 
 //            // 处理用户与公司的关系
 //            processUserCompanyRelationship(user, param, companyUser, company);
@@ -161,6 +161,10 @@ public class WxH5MpController {
             WxOAuth2AccessToken wxMpOAuth2AccessToken = wxMpService.getOAuth2Service().getAccessToken(param.getCode());
             WxOAuth2UserInfo wxMpUser = wxMpService.getOAuth2Service().getUserInfo(wxMpOAuth2AccessToken, null);
 
+            if (StringUtils.isEmpty(wxMpUser.getUnionId())){
+                return R.error("未绑定开放平台");
+            }
+
             // 处理用户信息
             FsUser user = processUserInfoByCourseLoginByMp(wxMpUser);