登录、注册修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/register/RegisterSchoolController.java

@@ -103,9 +103,9 @@ public class RegisterSchoolController extends BaseController
      * 注册信息查询
      */
     @GetMapping(value = "/query")
-    public AjaxResult queryInfo(String openId)
+    public AjaxResult queryInfo(String phonenumber)
     {
-        return registerSchoolService.queryInfo(openId);
+        return registerSchoolService.queryInfo(phonenumber);
     }
 
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -47,6 +47,17 @@ public class SysDeptController extends BaseController
         return success(depts);
     }
 
+    /**
+     * 获取部门列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:list')")
+    @GetMapping("/old/list")
+    public AjaxResult oldList(SysDept dept)
+    {
+        List<SysDept> depts = deptService.selectDeptOldList(dept);
+        return success(depts);
+    }
+
     /**
      * 获取部门列表(无权限控制)
      */

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java

@@ -127,8 +127,8 @@ public class SysLoginService
             throw new BaseException("对不起，未获取到手机号");
         }
 
-        //SysUser user = userService.getByPhone(dto.getPhoneNumber());
-        SysUser user = userService.getByOpenId(openId);
+        SysUser user = userService.getByPhone(dto.getPhoneNumber());
+        //SysUser user = userService.getByOpenId(openId);
         if (user == null){
             throw new BaseException("对不起，未获取到相关信息");
         }
@@ -144,7 +144,7 @@ public class SysLoginService
 
             throw new ServiceException("对不起，您的账号：" + phonenumber + " 已停用");
         }
-        //passwordService.validate(user);
+        passwordService.validate(user);
         LoginUser loginUser = createLoginUser(user);
         recordLoginInfo(loginUser.getUserId());
         return tokenService.createToken(loginUser);

ruoyi-system/src/main/java/com/ruoyi/system/mapper/RegisterParentsMapper.java

@@ -60,4 +60,6 @@ public interface RegisterParentsMapper
     public int deleteRegisterParentsByIds(Long[] ids);
 
     RegisterParents selectRegisterParentsByOppenId(String oppenId);
+
+    RegisterParents selectRegisterParentsByPhonenumber(String phonenumber);
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/RegisterSchoolMapper.java

@@ -62,4 +62,8 @@ public interface RegisterSchoolMapper
     RegisterSchool selectRegisterSchooByOppenId(String openId);
 
     void deleteRegisterSchoolByOpenId(String openId);
+
+    RegisterSchool selectRegisterSchooByPhonenumber(String phonenumber);
+
+    void deleteRegisterSchoolByPhonenumber(String phonenumber);
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/RegisterTeacherMapper.java

@@ -65,4 +65,6 @@ public interface RegisterTeacherMapper
     RegisterTeacher selectRegisterTeacherByOppenId(String oppenId);
 
     List<RegisterTeacher> selectRegisterTeacherListByTime(@Param("monthFirst") String monthFirst, @Param("deptId")Long deptId);
+
+    RegisterTeacher selectRegisterTeacherByPhonenumber(String phonenumber);
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java

@@ -123,4 +123,6 @@ public interface SysDeptMapper
     void updateDeptIsStatus(Long parentId);
 
     List<SysDept> selectDeptListChildren(Long parentId);
+
+    List<SysDept> selectDeptOldList(SysDept dept);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/IRegisterSchoolService.java

@@ -61,5 +61,5 @@ public interface IRegisterSchoolService
      */
     public int deleteRegisterSchoolById(Long id);
 
-    AjaxResult queryInfo(String openId);
+    AjaxResult queryInfo(String phonenumber);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java

@@ -130,4 +130,6 @@ public interface ISysDeptService
     AjaxResult selectDeptSixList(SysDept dept);
 
     List<SysDept> selectDeptListChildren(Long parentId);
+
+    List<SysDept> selectDeptOldList(SysDept dept);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RegisterParentsServiceImpl.java

@@ -67,14 +67,14 @@ public class RegisterParentsServiceImpl implements IRegisterParentsService
     {
 
         //查询是否已经注册过
-        RegisterParents registerParentsOld = registerParentsMapper.selectRegisterParentsByOppenId(registerParents.getOpenId());
+        RegisterParents registerParentsOld = registerParentsMapper.selectRegisterParentsByPhonenumber(registerParents.getUserPhone());
         if(registerParentsOld!=null){
             if(registerParentsOld.getIsPass().equals("1")){
-                return AjaxResult.error("该微信已注册当前身份，信息正在审核中。",registerParentsOld);
+                return AjaxResult.error("该手机号已注册当前身份，信息正在审核中。",registerParentsOld);
             }else if(registerParentsOld.getIsPass().equals("2")){
-                return AjaxResult.error("该微信已注册当前身份，审核已通过，请登录。",registerParentsOld);
+                return AjaxResult.error("该手机号已注册当前身份，审核已通过，请登录。",registerParentsOld);
             }else{
-                return AjaxResult.error("该微信已注册当前身份，审核未通过。",registerParentsOld);
+                return AjaxResult.error("该手机号已注册当前身份，审核未通过。",registerParentsOld);
             }
         }
         registerParents.setCreateTime(DateUtils.getNowDate());

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RegisterSchoolServiceImpl.java

@@ -93,14 +93,14 @@ public class RegisterSchoolServiceImpl implements IRegisterSchoolService
     public AjaxResult insertRegisterSchool(RegisterSchool registerSchool)
     {
         //查询是否已经注册过
-        RegisterSchool registerSchoolOld = registerSchoolMapper.selectRegisterSchooByOppenId(registerSchool.getOpenId());
+        RegisterSchool registerSchoolOld = registerSchoolMapper.selectRegisterSchooByPhonenumber(registerSchool.getUserPhone());
         if(registerSchoolOld!=null){
             if(registerSchoolOld.getIsPass().equals("1")){
-                return AjaxResult.error("该微信已注册当前身份，信息正在审核中。",registerSchoolOld);
+                return AjaxResult.error("该手机号已注册当前身份，信息正在审核中。",registerSchoolOld);
             }else if(registerSchoolOld.getIsPass().equals("2")){
-                return AjaxResult.error("该微信已注册当前身份，审核已通过，请登录。",registerSchoolOld);
+                return AjaxResult.error("该手机号已注册当前身份，审核已通过，请登录。",registerSchoolOld);
             }else{
-                return AjaxResult.error("该微信已注册当前身份，审核未通过。",registerSchoolOld);
+                return AjaxResult.error("该手机号已注册当前身份，审核未通过。",registerSchoolOld);
             }
         }
         registerSchool.setCreateTime(DateUtils.getNowDate());
@@ -167,13 +167,13 @@ public class RegisterSchoolServiceImpl implements IRegisterSchoolService
     }
 
     @Override
-    public AjaxResult queryInfo(String openId) {
-        if(StringUtils.isEmpty(openId)){
+    public AjaxResult queryInfo(String phonenumber) {
+        if(StringUtils.isEmpty(phonenumber)){
             throw new ServiceException("参数获取异常，请稍后重试");
         }
         Map<String,Object> map = new HashMap<>();
         //查询学校里是否有注册信息
-        RegisterSchool registerSchoolOld = registerSchoolMapper.selectRegisterSchooByOppenId(openId);
+        RegisterSchool registerSchoolOld = registerSchoolMapper.selectRegisterSchooByPhonenumber(phonenumber);
         if(registerSchoolOld!=null){
             RegisterSchoolFile registerSchoolFile = new RegisterSchoolFile();
             registerSchoolFile.setSchoolId(registerSchoolOld.getId());
@@ -184,7 +184,7 @@ public class RegisterSchoolServiceImpl implements IRegisterSchoolService
         }
         map.put("school",registerSchoolOld);
         //查询老师是否有注册信息
-        RegisterTeacher registerTeacher = registerTeacherMapper.selectRegisterTeacherByOppenId(openId);
+        RegisterTeacher registerTeacher = registerTeacherMapper.selectRegisterTeacherByPhonenumber(phonenumber);
         if(registerTeacher!=null){
             RegisterTeacherClass registerTeacherClass = new RegisterTeacherClass();
             registerTeacherClass.setTeacherId(registerTeacher.getId());
@@ -196,7 +196,7 @@ public class RegisterSchoolServiceImpl implements IRegisterSchoolService
 
         map.put("teacher",registerTeacher);
         //查询家长注册信息
-        RegisterParents registerParents = registerParentsMapper.selectRegisterParentsByOppenId(openId);
+        RegisterParents registerParents = registerParentsMapper.selectRegisterParentsByPhonenumber(phonenumber);
         if(registerParents!=null){
             RegisterParentsStudent registerParentsStudent = new RegisterParentsStudent();
             registerParentsStudent.setParentsId(registerParents.getId());

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RegisterTeacherServiceImpl.java

@@ -80,7 +80,7 @@ public class RegisterTeacherServiceImpl implements IRegisterTeacherService
     public AjaxResult insertRegisterTeacher(RegisterTeacher registerTeacher)
     {
         //查询是否已经注册过
-        RegisterTeacher registerTeacherOld = registerTeacherMapper.selectRegisterTeacherByOppenId(registerTeacher.getOpenId());
+        RegisterTeacher registerTeacherOld = registerTeacherMapper.selectRegisterTeacherByPhonenumber(registerTeacher.getUserPhone());
         if(registerTeacherOld!=null){
             if(registerTeacherOld.getIsPass().equals("1")){
                 return AjaxResult.error("该微信已注册当前身份，信息正在审核中。",registerTeacherOld);

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -68,7 +68,9 @@ public class SysDeptServiceImpl implements ISysDeptService
             dept.setDeptId(user.getDeptId());
             if(user.getDeptId()==null || user.getDeptId() == 0L){
                 List<FormalTeacherClass> teacherClass = formalTeacherClassService.getTeacherClass(String.valueOf(user.getUserId()));
-                dept.setParentId(teacherClass.get(0).getSchoolId());
+                if(dept.getParentId()==null ||dept.getParentId()==0L){
+                    dept.setParentId(teacherClass.get(0).getSchoolId());
+                }
                 dept.setDeptId(teacherClass.get(0).getSchoolId());
             }
 
@@ -76,6 +78,21 @@ public class SysDeptServiceImpl implements ISysDeptService
         return deptMapper.selectDeptList(dept);
     }
 
+    @Override
+    @DataScope(deptAlias = "d")
+    public List<SysDept> selectDeptOldList(SysDept dept) {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        if(!"admin".equals(user.getUserName())){
+            dept.setParentId(user.getDeptId());
+            if(user.getDeptId()==null || user.getDeptId() == 0L){
+                List<FormalTeacherClass> teacherClass = formalTeacherClassService.getTeacherClass(String.valueOf(user.getUserId()));
+                dept.setParentId(teacherClass.get(0).getSchoolId());
+            }
+
+        }
+        return deptMapper.selectDeptOldList(dept);
+    }
+
     /**
      * 查询部门树结构信息
      * 
@@ -435,6 +452,8 @@ public class SysDeptServiceImpl implements ISysDeptService
         return deptMapper.selectDeptListChildren(parentId);
     }
 
+
+
     /**
      * 递归列表
      */

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -491,9 +491,9 @@ public class SysUserServiceImpl implements ISysUserService
             SysUser user = userMapper.selectUserById(userId);
             if(StringUtils.isNotEmpty(user.getOpenId())){
                 //删除学校表
-                registerSchoolMapper.deleteRegisterSchoolByOpenId(user.getOpenId());
+                registerSchoolMapper.deleteRegisterSchoolByPhonenumber(user.getPhonenumber());
                 //查询老师表
-                RegisterTeacher registerTeacher = registerTeacherMapper.selectRegisterTeacherByOppenId(user.getOpenId());
+                RegisterTeacher registerTeacher = registerTeacherMapper.selectRegisterTeacherByPhonenumber(user.getPhonenumber());
                 if(registerTeacher!=null){
                     //删除老师表
                     registerTeacherClassMapper.deleteRegisterTeacherClassByTeacherId(registerTeacher.getId());
@@ -501,7 +501,7 @@ public class SysUserServiceImpl implements ISysUserService
                 }
 
                 //删除学生数据
-                RegisterParents registerParents = registerParentsMapper.selectRegisterParentsByOppenId(user.getOpenId());
+                RegisterParents registerParents = registerParentsMapper.selectRegisterParentsByPhonenumber(user.getPhonenumber());
                 if(registerParents!=null){
                     //删除学生数据
                     registerParentsMapper.deleteRegisterParentsById(registerParents.getId());

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

@@ -40,6 +40,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where  open_id = #{openId} limit 1
     </select>
 
+    <select id="selectRegisterParentsByPhonenumber" resultMap="RegisterParentsResult">
+        <include refid="selectRegisterParentsVo"/>
+        where  user_phone = #{phonenumber} limit 1
+    </select>
+
     <insert id="insertRegisterParents" parameterType="RegisterParents" useGeneratedKeys="true" keyProperty="id">
         insert into register_parents
         <trim prefix="(" suffix=")" suffixOverrides=",">

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

@@ -46,6 +46,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectRegisterSchoolVo"/>
         where  open_id = #{openId} limit 1
     </select>
+    <select id="selectRegisterSchooByPhonenumber" resultMap="RegisterSchoolResult">
+        <include refid="selectRegisterSchoolVo"/>
+        where  user_phone = #{phonenumber} limit 1
+    </select>
 
     <insert id="insertRegisterSchool" parameterType="RegisterSchool" useGeneratedKeys="true" keyProperty="id">
         insert into register_school
@@ -114,4 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <delete id="deleteRegisterSchoolByOpenId">
         delete from register_school where open_id  = #{openId}
     </delete>
+    <delete id="deleteRegisterSchoolByPhonenumber">
+        delete from register_school where user_phone  = #{phonenumber}
+    </delete>
 </mapper>

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

@@ -48,6 +48,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectRegisterTeacherVo"/>
         where  open_id = #{openId} limit 1
     </select>
+
+    <select id="selectRegisterTeacherByPhonenumber" resultMap="RegisterTeacherResult">
+        <include refid="selectRegisterTeacherVo"/>
+        where  user_phone = #{phonenumber} limit 1
+    </select>
+
     <select id="selectRegisterTeacherListByTime" resultMap="RegisterTeacherResult">
         <include refid="selectRegisterTeacherVo"/>
         where date_format(create_time,'%Y%m') = date_format(#{monthFirst},'%Y%m')

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

@@ -96,8 +96,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		AND parent_id = #{parentId}
 		AND status = '0'
 	</select>
+	<select id="selectDeptOldList" resultMap="SysDeptResult">
+		<include refid="selectDeptVo"/>
+		where d.del_flag = '0'
+		<if test="parentId != null and parentId != 0">
+            AND parent_id = #{parentId}
+        </if>
+		<if test="deptName != null and deptName != ''">
+			AND dept_name like concat('%', #{deptName}, '%')
+		</if>
+		<if test="status != null and status != ''">
+			AND status = #{status}
+		</if>
+		<!-- 数据范围过滤 -->
+		${params.dataScope}
+		order by d.parent_id, d.order_num
+	</select>
 
-    <insert id="insertDept" parameterType="SysDept" useGeneratedKeys="true" keyProperty="deptId">
+	<insert id="insertDept" parameterType="SysDept" useGeneratedKeys="true" keyProperty="deptId">
  		insert into sys_dept(
  			<!--<if test="deptId != null and deptId != 0">dept_id,</if>-->
  			<if test="parentId != null and parentId != 0">parent_id,</if>