修改用户信息和学习信息

admin-core/src/main/java/com/ibeetl/admin/core/web/CoreUserController.java

@@ -151,8 +151,8 @@ public class CoreUserController {
 		coreUser.setJobType1(null);
 		coreUser.setId(null);
 
+		// 包含用户密码拷贝
 		BeanUtil.copyProperties(coreUser, user);
-		user.setPassword(passwordEncryptService.password(coreUser.getPassword()));
 		userService.update(user);
 		return JsonResult.success();
 	}

web/src/main/java/com/ibeetl/jlw/web/StudentController.java

@@ -1637,13 +1637,8 @@ public class StudentController{
             return JsonResult.failMessage("请登录后再操作");
         }
 
-        Student s = new Student();
+        studentQuery.setStudentId(student.getStudentId());
-        s.setStudentId(student.getStudentId());
+        boolean success = studentService.updateTemplate(studentQuery.pojo());
-        s.setHeadImg(null != fileEntity?fileEntity.getUrl():null);
-        s.setStudentMobile(studentQuery.getStudentMobile());
-        s.setStudentEmail(StringUtils.isNotBlank(studentQuery.getStudentEmail())?studentQuery.getStudentEmail():"");
-
-        boolean success = studentService.updateTemplate(s);
         if (success) {
             //更新缓存
             updateByIds(student.getId());