feat: 优化企业微信判断，优化gps分断处理

wlzboy

4 天以前 06a17c236d4cb9b8da75fce43af938cb7ea510bf

 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -28,6 +28,9 @@
        <result property="openId"       column="open_id"       />
        <result property="unionId"     column="union_id"     />
        <result property="wechatNickname" column="wechat_nickname" />
        <result property="qyWechatUserId" column="qy_wechat_user_id" />
        <result property="qyWechatUpdateTime" column="qy_wechat_update_time" />
        <result property="canViewAllConsult" column="can_view_all_consult" />
        <association property="dept"    javaType="SysDept"         resultMap="deptResult" />
        <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
    </resultMap>
@@ -52,7 +55,7 @@
    </resultMap>
   
   <sql id="selectUserVo">
        select u.user_id, u.dept_id, u.user_name,u.oa_user_id, u.oa_order_class, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.oa_user_id, u.create_by, u.create_time, u.remark,u.open_id,u.union_id,u.wechat_nickname,
        select u.user_id, u.dept_id, u.user_name,u.oa_user_id, u.oa_order_class, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.oa_user_id, u.create_by, u.create_time, u.remark,u.open_id,u.union_id,u.wechat_nickname,u.qy_wechat_user_id,u.qy_wechat_update_time,u.can_view_all_consult,
        d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
        from sys_user u
@@ -169,6 +172,8 @@
          <if test="status != null and status != ''">status,</if>
          <if test="oaUserId != null">oa_user_id,</if>
          <if test="oaOrderClass != null and oaOrderClass != ''">oa_order_class,</if>
          <if test="qyWechatUserId != null and qyWechatUserId != ''">qy_wechat_user_id,</if>
          <if test="qyWechatUpdateTime != null">qy_wechat_update_time,</if>
          <if test="createBy != null and createBy != ''">create_by,</if>
          <if test="remark != null and remark != ''">remark,</if>
          create_time
@@ -185,6 +190,9 @@
          <if test="status != null and status != ''">#{status},</if>
          <if test="oaUserId != null">#{oaUserId},</if>
          <if test="oaOrderClass != null and oaOrderClass != ''">#{oaOrderClass},</if>
          <if test="canViewAllConsult != null and canViewAllConsult != ''">#{canViewAllConsult},</if>
          <if test="qyWechatUserId != null and qyWechatUserId != ''">#{qyWechatUserId},</if>
          <if test="qyWechatUpdateTime != null">#{qyWechatUpdateTime},</if>
          <if test="createBy != null and createBy != ''">#{createBy},</if>
          <if test="remark != null and remark != ''">#{remark},</if>
          sysdate()
@@ -204,6 +212,9 @@
          <if test="status != null and status != ''">status = #{status},</if>
          <if test="oaUserId != null">oa_user_id = #{oaUserId},</if>
          <if test="oaOrderClass != null">oa_order_class = #{oaOrderClass},</if>
          <if test="canViewAllConsult != null and canViewAllConsult != ''">can_view_all_consult = #{canViewAllConsult},</if>
          <if test="qyWechatUserId != null and qyWechatUserId != ''">qy_wechat_user_id = #{qyWechatUserId},</if>
          <if test="qyWechatUpdateTime != null">qy_wechat_update_time = #{qyWechatUpdateTime},</if>
          <if test="openId != null and openId != ''">open_id = #{openId},</if>
          <if test="unionId != null and unionId != ''">union_id = #{unionId},</if>
          <if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
@@ -252,6 +263,12 @@
      where u.open_id = #{openId} and u.del_flag = '0'
   </select>
   
   <!-- 通过企业微信用户ID查询用户 -->
   <select id="selectUserByQyWechatUserId" parameterType="String" resultMap="SysUserResult">
      <include refid="selectUserVo"/>
      where u.qy_wechat_user_id = #{qyWechatUserId} and u.del_flag = '0'
   </select>
	
   <!-- 根据分公司ID列表查询用户（包含分公司及其所有子部门的用户） -->
   <select id="selectUsersByBranchDeptIds" resultMap="SysUserResult">
      SELECT DISTINCT