Merge remote-tracking branch 'cloud-schoolapi/ywx'

suser/src/main/java/com/xhkjedu/suser/mapper/system/UserMapper.java

@@ -204,4 +204,7 @@ public interface UserMapper extends TkMapper<TUser> {
 
     //根据用户id获取绑定方式
     Map getBindById(Integer userid);
+
+    //获取手机号绑定的其他用户数量
+    Integer getNumByUserPhone(Integer userid, String userphone);
 }

suser/src/main/java/com/xhkjedu/suser/service/system/UserService.java

@@ -867,6 +867,9 @@ public class UserService extends JedisUtil {
     public ResultVo bindUserPhone(Integer userid, String userphone, Integer msgcode) {
         ResultVo resultVo = getCodeResultVo(userphone, msgcode);
         if (resultVo != null) return resultVo;
+        //获取手机号绑定的其他用户数量
+        Integer num = userMapper.getNumByUserPhone(userid, userphone);
+        if (num != 0) return new ResultVo(1, "该手机号已被其他账号绑定");
         userMapper.bindUserPhone(userid, userphone);
         return new ResultVo(0, "绑定手机成功");
     }

suser/src/main/resources/mapper/system/UserMapper.xml

@@ -13,7 +13,7 @@
     </select>
     <!--学生andorid登录，20211221添加GROUP_CONCAT，因为不绑定的情况下一个mac可以多个帐号登录-->
     <select id="getUserByLoginnameMac" resultType="com.xhkjedu.suser.vo.system.UserVo">
-        select u.userid,u.username,u.loginname,u.loginpwd,u.userbirthday,u.cardid,u.headpic,u.usertype,
+        select u.userid,u.username,u.loginname,u.loginpwd,u.userbirthday,u.cardid,u.headpic,u.usertype,u.usersex,u.userphone,
         u.userstate,u.opepassword,u.createid,u.createtime,u.deleteid,u.deletetime,u.schoolid,u.bindmac,u.mac,u.usertime
         ,s.year,s.schoolname,s.schoollevel,s.schoolstate,s.bindmac sbindmac,s.errorrate,s.schooldomain
         ,(case when u.userphone is null or u.userphone='' then 0 else 1 end)hasphone
@@ -94,8 +94,12 @@
         <result property="userphone" column="userphone"></result>
         <result property="usertime" column="usertime"></result>
         <result property="createtime" column="createtime"></result>
-        <result property="lsbname" column="lsbname"></result>
         <result property="rolename" column="rolename"></result>
+        <collection property="lsblist" ofType="java.util.Map" javaType="java.util.List">
+            <result property="subjectname" column="subjectname"></result>
+            <result property="versionname" column="versionname"></result>
+            <result property="lsbname" column="lsbname"></result>
+        </collection>
         <collection property="classlist" ofType="java.util.Map"
                     javaType="java.util.List" select="listTeacherClass" column="{userid=userid,classtype=classtype,year=year}">
         </collection>
@@ -118,8 +122,7 @@
     <!--教师基本信息-->
     <select id="getTeacherInfo" resultMap="teacherInfoMap">
         select u.userid,u.username,u.headpic,u.loginname,u.usersex,u.userphone,u.usertime,u.createtime
-        ,group_concat(distinct s.subjectname order by s.subjectorder)subjectname
-        ,group_concat(concat(s.subjectname,'-',v.versionname,'-',sb.lsbname) separator '  ')lsbname
+        ,s.subjectname,v.versionname,sb.lsbname
         ,(select group_concat(r.rolename separator '  ')
         from t_user_role ur left join t_role r on ur.roleid=r.roleid where ur.userid=#{userid})rolename
         ,#{classtype} classtype,#{year} year
@@ -129,6 +132,7 @@
         left join t_subject s on sb.subjectid=s.subjectid
         LEFT JOIN t_version v ON sb.versionid=v.versionid
         where u.userid=#{userid}
+        order by s.subjectorder,v.versionorder,sb.lsborder
     </select>
     <!--更新学生硬件绑定信息-->
     <update id="updateBindMac">
@@ -191,6 +195,10 @@
         select userphone,bindphoned,bindsecret
         from t_user where userid=#{userid} limit 1
     </select>
+    <!--获取手机号绑定的其他用户数量-->
+    <select id="getNumByUserPhone" resultType="java.lang.Integer">
+        select count(*) from t_user where userid!=#{userid} and userphone=#{userphone}
+    </select>
 
 
 </mapper>