update

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentManageListDto.java

@@ -21,6 +21,8 @@ public class StudentManageListDto {
     @ApiModelProperty(value = "用户名",required = false)
     private String username;
 
+    private String nation;
+
     @ApiModelProperty(value = "性别",required = false)
     private UserGenderEnum gender;
 
@@ -42,6 +44,14 @@ public class StudentManageListDto {
     @ApiModelProperty(value = "课程余额")
     private BigDecimal courseBalance;
 
+    public String getNation() {
+        return nation;
+    }
+
+    public void setNation(String nation) {
+        this.nation = nation;
+    }
+
     public String getUsername() {
         return username;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentManageServiceImpl.java

@@ -313,10 +313,7 @@ public class StudentManageServiceImpl implements StudentManageService {
             throw new BizException("参数校验失败");
         }
         SysUser sysUser1 = sysUserFeignService.queryUserByMobile(sysUser.getPhone());
-        if(sysUser1 == null){
-            throw new BizException("用户不存在");
-        }
-        if(!userId.equals(sysUser1.getId())){
+        if(sysUser1 != null && !userId.equals(sysUser1.getId())){
             throw new BizException("手机号已被占用");
         }
         teacherDao.updateUser(sysUser);

mec-biz/src/main/resources/config/mybatis/StudentManageDao.xml

@@ -5,6 +5,7 @@
     <resultMap id="studentManageListDto" type="com.ym.mec.biz.dal.dto.StudentManageListDto">
         <result property="userId" column="user_id_"/>
         <result property="realName" column="real_name_"/>
+        <result property="nation" column="nation_"/>
         <result property="parentsPhone" column="parents_phone_"/>
         <result property="parentsName" column="real_name_"/>
         <result property="gender" column="gender_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
@@ -119,7 +120,7 @@
     </update>
 
     <select id="findStudentsByOrganId" resultMap="studentManageListDto">
-        SELECT su.id_ user_id_,su.username_,su.gender_,su.phone_ parents_phone_,su.real_name_,su.birthdate_
+        SELECT su.id_ user_id_,su.username_,su.gender_,su.phone_ parents_phone_,su.real_name_,su.birthdate_,su.nation_
         FROM sys_user su
         <include refid="findStudentsByOrganIdSql"/>
         ORDER BY su.create_time_ DESC
@@ -148,7 +149,7 @@
     </select>
     <select id="findStudentBaseInfoByUserID" resultMap="studentManageListDto">
         SELECT su.username_,su.gender_,su.birthdate_,sr.parents_name_ real_name_,su.id_ user_id_,
-        sr.parents_phone_,sr.current_class_,sr.current_grade_
+        sr.parents_phone_,sr.current_class_,sr.current_grade_,su.nation_
         FROM sys_user su
         LEFT JOIN student_registration sr ON su.id_ = sr.user_id_
         WHERE su.id_ =#{userId} AND su.user_type_ = 'STUDENT' LIMIT 1

mec-web/src/main/java/com/ym/mec/web/controller/StudentManageController.java

@@ -72,7 +72,7 @@ public class StudentManageController extends BaseController {
     @ApiOperation(value = "修改学员信息")
     @PostMapping("/studentUpdate")
     @PreAuthorize("@pcs.hasPermissions('studentManage/studentUpdate')")
-    public Object studentUpdate(Integer id, String phone, String username, Integer gender, String realName, Date birthdate){
+    public Object studentUpdate(Integer id, String phone, String username, Integer gender, String realName, Date birthdate,String nation){
         SysUser sysUser = new SysUser();
         sysUser.setId(id);
         sysUser.setPhone(phone);
@@ -80,6 +80,7 @@ public class StudentManageController extends BaseController {
         sysUser.setGender(gender);
         sysUser.setRealName(realName);
         sysUser.setBirthdate(birthdate);
+        sysUser.setNation(nation);
         return succeed(studentManageService.studentUpdate(sysUser));
     }