Merge branch 'saas' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/service/OrganizationService.java

@@ -71,6 +71,8 @@ public interface OrganizationService extends BaseService<Integer, Organization>
     List<Organization> findAllOrgans(Integer tenantId);
 
     List<Organization> findOrgans(List<Integer> organIds,Integer tenantId);
+    
+    List<Organization> queryEmployeeOrgan(String organId);
 
     /**
     * @description: 校验当前用户是否只有教务老师角色,并给教务老师角色赋值

mec-biz/src/main/java/com/ym/mec/biz/service/impl/OrganizationServiceImpl.java

@@ -176,6 +176,11 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 	}
 
     @Override
+	public List<Organization> queryEmployeeOrgan(String organId) {
+		return organizationDao.queryEmployeeOrgan(organId);
+	}
+
+	@Override
     public <T extends EducationBaseQueryInfo> T onlyEducation(T queryInfo) {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {

mec-web/src/main/java/com/ym/mec/web/controller/education/EduOrganizationController.java

@@ -1,18 +1,23 @@
 package com.ym.mec.web.controller.education;
 
-import com.ym.mec.biz.dal.entity.CooperationOrgan;
-import com.ym.mec.biz.service.CooperationOrganService;
-import com.ym.mec.biz.service.OrganizationService;
-import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.entity.CooperationOrgan;
+import com.ym.mec.biz.dal.entity.Organization;
+import com.ym.mec.biz.service.CooperationOrganService;
+import com.ym.mec.biz.service.OrganizationService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
 
 @RequestMapping("eduOrganization")
 @Api(tags = "分部服务")
@@ -23,16 +28,28 @@ public class EduOrganizationController extends BaseController {
     private OrganizationService organizationService;
     @Autowired
     private CooperationOrganService cooperationOrganService;
+    
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
 
     @ApiOperation(value = "获取员工所在分部列表")
     @GetMapping("/queryAllOrgan")
-    public Object queryAllOrgan(Integer tenantId) throws Exception {
-        return succeed(organizationService.queryAllOrganWithNoAuth(tenantId));
+    public HttpResponseResult<List<Organization>> queryAllOrgan() throws Exception {
+
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if(sysUser == null || sysUser.getId() == null){
+	    	Integer tenantId = 1;
+	        return succeed(organizationService.queryAllOrganWithNoAuth(tenantId));
+		}else{
+			String organIds = organizationService.getEmployeeOrgan(sysUser.getId(), "", sysUser.getIsSuperAdmin());
+	        return succeed(organizationService.queryEmployeeOrgan(organIds));
+		}
+    	
     }
 
     @ApiOperation(value = "获取员工所在分部列表")
     @GetMapping("/queryEmployeeOrgan")
-    public Object queryEmployeeOrgan() throws Exception {
+    public HttpResponseResult<List<Organization>> queryEmployeeOrgan() throws Exception {
         return succeed(organizationService.queryEmployeeOrgan());
     }