Merge remote-tracking branch 'origin/master_saas' into master_saas

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

@@ -19,6 +19,8 @@ public interface OrganizationService extends BaseService<Integer, Organization>
      * @return
      */
     List<Organization> queryEmployeeOrgan() throws Exception;
+    
+    List<Organization> queryAllOrganWithNoAuth(Integer tenantId);
 
     /**
      * 获取员工坐在分部列表

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

@@ -80,6 +80,11 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 	}
 
 	@Override
+	public List<Organization> queryAllOrganWithNoAuth(Integer tenantId) {
+		return organizationDao.findAllOrgans(tenantId);
+	}
+
+	@Override
 	public List<Organization> queryEmployeeOrganByUser(){
 		return this.queryEmployeeOrgan();
 	}

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

@@ -26,8 +26,8 @@ public class EduOrganizationController extends BaseController {
 
     @ApiOperation(value = "获取员工所在分部列表")
     @GetMapping("/queryAllOrgan")
-    public Object queryAllOrgan() throws Exception {
-        return succeed(organizationService.queryEmployeeOrgan());
+    public Object queryAllOrgan(Integer tenantId) throws Exception {
+        return succeed(organizationService.queryAllOrganWithNoAuth(tenantId));
     }
 
     @ApiOperation(value = "获取员工所在分部列表")