diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/web/CoreUserController.java b/admin-core/src/main/java/com/ibeetl/admin/core/web/CoreUserController.java index 699ef09b..02ce4bb6 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/web/CoreUserController.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/web/CoreUserController.java @@ -17,6 +17,7 @@ import com.ibeetl.admin.core.util.HttpRequestLocal; import com.ibeetl.admin.core.web.dto.FunctionNodeView; import com.ibeetl.admin.core.web.dto.MenuNodeView; import com.ibeetl.admin.core.web.dto.SystemMenuView; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -146,6 +147,7 @@ public class CoreUserController { public JsonResult editDo(CoreUser coreUser) { // 获取当前登录用户 CoreUser user = getUser(); + Assert.notNull(user, "请登录后再操作"); // 禁止修改的一些属性,先给去掉 @@ -161,7 +163,10 @@ public class CoreUserController { int i = coreUserDao.updateTemplateById(coreUser); //及时更新登录用户的信息 if (i>0){ - user.setHeadImg(coreUser.getHeadImg()); + if (StringUtils.isNotBlank(coreUser.getHeadImg())){ + user.setHeadImg(coreUser.getHeadImg()); + httpRequestLocal.setAttribute(CorePlatformService.ACCESS_CURRENT_USER,user); + } } return JsonResult.success(); diff --git a/web/src/main/java/com/ibeetl/jlw/web/StudentController.java b/web/src/main/java/com/ibeetl/jlw/web/StudentController.java index aeb436e2..471c38c4 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/StudentController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/StudentController.java @@ -19,6 +19,7 @@ import com.ibeetl.admin.core.file.FileService; import com.ibeetl.admin.core.service.CorePlatformService; import com.ibeetl.admin.core.service.CoreUserService; import com.ibeetl.admin.core.util.BeanCopyUtil; +import com.ibeetl.admin.core.util.HttpRequestLocal; import com.ibeetl.admin.core.util.PlatformException; import com.ibeetl.admin.core.util.TimeTool; import com.ibeetl.admin.core.web.JsonResult; @@ -66,6 +67,7 @@ import static cn.jlw.token.TokenService.updateByIds; import static cn.jlw.util.CacheUserUtil.getStudent; import static cn.jlw.util.excel.ExcelUtil.standardName; import static com.ibeetl.admin.console.service.OrgConsoleService.setObjectOrgId; +import static com.ibeetl.admin.core.service.CorePlatformService.T_STUDENT; import static com.ibeetl.admin.core.util.ExcelUtil.convertData; import static com.ibeetl.admin.core.util.ExcelUtil.write; import static com.ibeetl.admin.core.util.excelGroupValidation.ExcelUtil.createExcel; @@ -140,6 +142,9 @@ public class StudentController extends BaseController{ @Autowired private UniversityFacultyService universityFacultyService; + @Autowired + private HttpRequestLocal httpRequestLocal; + /* 前端接口 */ /** @@ -1654,6 +1659,15 @@ public class StudentController extends BaseController{ if (success) { //更新缓存 updateByIds(student.getId().toString()); + if (StringUtils.isNotBlank(studentQuery.getHeadImg())){ + student.setHeadImg(studentQuery.getHeadImg()); + Object sessionValue = httpRequestLocal.getSessionValue(T_STUDENT); + if(null != sessionValue){ + Student bean = (Student) sessionValue; + bean.setHeadImg(studentQuery.getHeadImg()); + httpRequestLocal.setSessionValue(T_STUDENT,bean); + } + } return JsonResult.success(); } else { return JsonResult.failMessage("更新失败");