update

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

@@ -85,6 +85,15 @@ public class ExaminationBasicController extends BaseController {
     @ApiOperation("关闭考级项目")
     @PostMapping(value = "/closeExam")
     public HttpResponseResult closeExam(Integer examId, String reason){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        Integer organId = null;
+        if(!sysUser.getIsSuperAdmin()){
+            Employee employee = employeeService.get(sysUser.getId());
+            if(Objects.isNull(employee)){
+                return failed("用户信息异常");
+            }
+            organId = employee.getOrganId();
+        }
         examinationBasicService.closeExam(examId, reason);
         return succeed();
     }

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

@@ -12,7 +12,6 @@ import com.keao.edu.user.dto.TenantInfoDto;
 import com.keao.edu.user.entity.TenantInfo;
 import com.keao.edu.user.service.TenantInfoService;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,10 +56,14 @@ public class TenantInfoController extends BaseController {
 	@ApiOperation("更新机构")
 	@PostMapping(value = "/update")
 	public HttpResponseResult update(@RequestBody TenantInfoDto tenantInfo) {
-		String tenantId = TenantContextHolder.getTenantId();
-		if(StringUtils.isNotEmpty(tenantId)){
-			tenantInfo.setId(Integer.parseInt(tenantId));
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if(!sysUser.getIsSuperAdmin()){
+			String tenantId = TenantContextHolder.getTenantId();
+			if(StringUtils.isNotEmpty(tenantId)){
+				tenantInfo.setId(Integer.parseInt(tenantId));
+			}
 		}
+
 		tenantInfo.setUpdateTime(new Date());
 		tenantInfoService.updateTenant(tenantInfo);
 		return succeed();

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExaminationBasicServiceImpl.java

@@ -237,6 +237,9 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
         if (Objects.isNull(examinationBasic)) {
             throw new BizException("考级项目不存在");
         }
+
+//        List<Integer> childOrganIds = organizationService.getChildOrganIds(queryInfo.getOrganId(), true);
+
         if (StringUtils.isBlank(reason)) {
             reason = "后台手动关闭";
         }