Browse Source

Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-2/examcloud-core-basic.git

wangwei 7 năm trước cách đây
mục cha
commit
de2913d2fb

+ 2 - 1
examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/OrgApi.java

@@ -113,7 +113,8 @@ public class OrgApi extends ControllerSupport{
         cn.com.qmth.examcloud.commons.web.security.bean.User accessUser = getAccessUser();
         if(accessUser != null){
             if(accessUser.getRootOrgId().longValue() != accessUser.getOrgId().longValue()){
-                return new ResponseEntity(orgRepo.findById(parentId), HttpStatus.OK);
+            	return new ResponseEntity(orgRepo.findById(accessUser.getOrgId()), HttpStatus.OK);
+               // return new ResponseEntity(orgRepo.findById(parentId), HttpStatus.OK);
             }
         }
         return new ResponseEntity(orgRepo.findByParentId(parentId), HttpStatus.OK);