fs-admin/src/main/java/com/fs/qw/controller/QwCompanyController.java

@@ -117,7 +117,9 @@ public class QwCompanyController extends BaseController
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
 
         qwCompany.setCreateUserId(loginUser.getUserId());
-        qwCompany.setCreateDeptId(loginUser.getDeptId());
+        if(qwCompany.getCreateDeptId() == null || qwCompany.getCreateDeptId() == 0){
+            qwCompany.setCreateDeptId(loginUser.getDeptId());
+        }
         return toAjax(qwCompanyService.insertQwCompany(qwCompany));
     }
 

fs-service/src/main/resources/mapper/qw/QwCompanyMapper.xml

@@ -30,10 +30,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="msgPrivateKey"    column="msg_private_key"    />
         <result property="miniAppId"    column="mini_app_id"    />
         <result property="companyServerNum"    column="company_server_num"    />
+        <result property="createDeptId"    column="create_dept_id"    />
     </resultMap>
 
     <sql id="selectQwCompanyVo">
-        select id, corp_id, corp_name, open_secret, open_corp_id, server_agent_id, server_book_corp_id, server_book_secret, token, encoding_aes_key, provider_secret, realm_name_url, notify_url, chat_toolbar, chat_toolbar_oauth, company_ids, status, create_time, update_time, create_by,is_buy,mini_app_id,company_server_num from qw_company
+        select id, corp_id, corp_name, open_secret, open_corp_id, server_agent_id, server_book_corp_id, server_book_secret, token, encoding_aes_key, provider_secret, realm_name_url, notify_url, chat_toolbar, chat_toolbar_oauth, company_ids, status, create_time, update_time, create_by,is_buy,mini_app_id,company_server_num,create_dept_id from qw_company
     </sql>
 
     <select id="selectQwCompanyList" parameterType="QwCompany" resultMap="QwCompanyResult">
@@ -153,6 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isBuy != null">is_buy = #{isBuy},</if>
             <if test="miniAppId != null">mini_app_id = #{miniAppId},</if>
             <if test="companyServerNum != null">company_server_num = #{companyServerNum},</if>
+            <if test="createDeptId != null">create_dept_id = #{createDeptId},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -335,26 +335,66 @@ public class AppLoginController extends AppBaseController{
         if (StringUtils.isEmpty(param.getPhone())) {
             return R.error("获取手机号失败");
         }
-        // 根据手机号查询用户
-        FsUser user = findUserByPhone(param.getPhone());
+        String phone = param.getPhone();
+        String encryptedPhone = encryptPhone(phone);
+
+        // 根据手机号查用户
+        FsUser user = findUserByPhone(phone);
+        logger.info("zyp app绑定微信，param: {}", param);
+        Map tokenResult = WxUtil.getAccessToken(param.getCode(), openProperties.getAppId(), openProperties.getSecret());
+        logger.info("APP的ID信息: {}", openProperties.getAppId());
+        logger.info("APP的密钥信息: {}", openProperties.getSecret());
+        String accessToken = tokenResult.get("access_token").toString();
+        String unionid = String.valueOf(tokenResult.get("unionid"));
+        logger.info("APP获取的唯一ID信息: {}",unionid);
+        String openid = String.valueOf(tokenResult.get("openid"));
+        // 获取微信用户信息
+        Map userInfo = WxUtil.getUserInfo(accessToken, openid);
+        if (userInfo == null) {
+            return R.error("获取微信用户信息失败");
+        }
+        String nickname = String.valueOf(userInfo.get("nickname"));
+        Integer sex = (Integer) userInfo.get("sex");
+        String avatar = String.valueOf(userInfo.get("headimgurl"));
+        if (tokenResult == null || tokenResult.get("access_token") == null) {
+            return R.error("微信授权失败");
+        }
+        // 手机号不存在，根据unionid查询
         if (user == null) {
-            createNewUser(param);
-            return R.ok().put("isNew",true).put("phone",encryptPhone(param.getPhone()));
-        } else {
-            if (user.getUnionId()==null){
-                if (user.getPhone().length()<=11){
-                    FsUser fsUser = new FsUser();
-                    fsUser.setUserId(user.getUserId());
-                    fsUser.setPhone(encryptPhone(param.getPhone()));
-                    userMapper.updateFsUser(fsUser);
-                    logger.info("zyp \n【手机加密】：{}",encryptPhone(param.getPhone()));
+            // 根据unionid查询不到，创建新用户
+            FsUser userByUnionId = userMapper.selectFsUserByUnionid(unionid);
+            if (userByUnionId == null) {
+                FsUser newUser = createNewUser(param);
+                return generateTokenAndReturn(newUser);
+            }else {
+                //根据手机号查不到但是根据unionid查到了，将手机号和这个用户关联起来
+                if (userByUnionId.getPhone() != null){
+                    return R.error("该微信已绑定其他用户,请勿重复绑定!");
                 }
-                return R.ok().put("isNew",true).put("phone",encryptPhone(param.getPhone()));
+                userByUnionId.setPhone(encryptPhone(param.getPhone()));
+                userByUnionId.setNickName(nickname);
+                userByUnionId.setAvatar(avatar);
+                userByUnionId.setSex(sex);
+                userByUnionId.setJpushId(param.getJpushId());
+                userMapper.updateFsUser(userByUnionId);
+                return generateTokenAndReturn(userByUnionId);
             }
-            if (StringUtils.isNotEmpty(param.getJpushId())) {
-                updateExistingUserJpushId(user, param.getJpushId());
+        }else {
+            // 手机号存在，但unionId为空,绑定微信
+            if (user.getUnionId() == null) {
+                user.setUnionId(unionid);
+                user.setNickName(nickname);
+                user.setAvatar(avatar);
+                user.setSex(sex);
+                user.setJpushId(param.getJpushId());
+                userMapper.updateFsUser(user);
+                return generateTokenAndReturn(user);
             }
         }
+        //用户已存在且 unionid 存在更新 JPush ID
+        if (StringUtils.isNotEmpty(param.getJpushId())) {
+            updateExistingUserJpushId(user, param.getJpushId());
+        }
         return generateTokenAndReturn(user);
     }
 

fs-user-app/src/main/java/com/fs/app/param/FsUserLoginParam.java

@@ -23,4 +23,5 @@ public class FsUserLoginParam implements Serializable {
 
     private String loginDevice;
     private String source;
+    private String unionid;
 }