Merge remote-tracking branch 'origin/master'

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/web/controller/RoleController.java

@@ -58,6 +58,7 @@ public class RoleController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('role/update')")
 	public Object updateRole(@RequestBody SysRole sysRole) {
 		sysRole.setUpdateTime(new Date());
+		sysRole.setTenantId(TenantContextHolder.getTenantId().toString());
 		sysRoleService.updateRole(sysRole);
 		return succeed();
 	}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamRegistrationController.java

@@ -44,7 +44,7 @@ public class ExamRegistrationController extends BaseController {
     private EmployeeService employeeService;
 
     @ApiOperation(value = "学员报名记录查询")
-    @PostMapping(value = "list")
+    @GetMapping(value = "list")
     @PreAuthorize("@pcs.hasPermissions('examRegistration/list')")
     public HttpResponseResult<PageInfo<ExamRegistration>> list(ExamRegistrationQueryInfo queryInfo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
@@ -58,7 +58,7 @@ public class ExamRegistrationController extends BaseController {
     }
 
     @ApiOperation(value = "学生端学员报名记录查询")
-    @PostMapping(value = "applyList")
+    @GetMapping(value = "applyList")
     public HttpResponseResult<PageInfo<ExamRegistrationDto>> applyList(ExamRegistrationQueryInfo queryInfo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         queryInfo.setStudentId(sysUser.getId());

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/TenantInfoController.java

@@ -55,9 +55,9 @@ public class TenantInfoController extends BaseController {
 		if(!sysUser.getIsSuperAdmin()){
 			String tenantId = TenantContextHolder.getTenantId().toString();
 			tenantInfo.setId(Integer.parseInt(tenantId));
-			tenantInfoService.update(tenantInfo);
 		}
 		tenantInfo.setUpdateTime(new Date());
+		tenantInfoService.update(tenantInfo);
 		return succeed();
 	}