老师端支持查看教材课件

cms/src/main/java/com/ym/mec/cms/controller/NewsController.java

@@ -7,7 +7,6 @@ import com.ym.mec.cms.controller.queryinfo.NewsInformationQueryInfo;
 import com.ym.mec.cms.dal.dao.SysNewsInformationDao;
 import com.ym.mec.cms.dal.entity.SysConfig;
 import com.ym.mec.cms.dal.entity.SysNewsInformation;
-import com.ym.mec.cms.service.OrganizationService;
 import com.ym.mec.cms.service.SysConfigService;
 import com.ym.mec.cms.service.SysNewsInformationService;
 import com.ym.mec.cms.service.SysNewsTypeService;
@@ -50,8 +49,6 @@ public class NewsController extends BaseController {
     @Autowired
     private WebFeignService webFeignService;
     @Autowired
-    private OrganizationService organizationService;
-    @Autowired
     private SysConfigService sysConfigService;
 
     @ApiOperation("查询底部按钮信息")
@@ -213,7 +210,9 @@ public class NewsController extends BaseController {
         String organIds = "";
         if(sysUser != null && sysUser.getId() != null){
             userId = sysUser.getId();
-            organIds = organizationService.getEmployeeOrgan(sysUser.getId(), null, sysUser.getIsSuperAdmin() && sysUser.getTenantId() == -1);
+            if(id.equals(23)){
+                organIds = sysNewsInformationDao.queryTeacherOrgan(userId);
+            }
         }
         return succeed(sysNewsTypeService.listWithTree(id,memo,userId,organIds));
 	}

cms/src/main/java/com/ym/mec/cms/dal/dao/OrganizationDao.java

@@ -1,9 +0,0 @@
-package com.ym.mec.cms.dal.dao;
-
-
-import com.ym.mec.cms.dal.entity.Organization;
-import com.ym.mec.common.dal.BaseDAO;
-
-public interface OrganizationDao extends BaseDAO<Integer, Organization> {
-
-}

cms/src/main/java/com/ym/mec/cms/dal/dao/SysNewsInformationDao.java

@@ -38,4 +38,6 @@ public interface SysNewsInformationDao extends BaseDAO<Long, SysNewsInformation>
     Integer queryHomework(Integer teacherId);
 
     int queryPractice(@Param("userId") Integer userId, @Param("date") String date);
+
+	String queryTeacherOrgan(Integer userId);
 }

cms/src/main/java/com/ym/mec/cms/dal/entity/Organization.java

@@ -1,64 +0,0 @@
-package com.ym.mec.cms.dal.entity;
-
-import com.ym.mec.common.entity.BaseEntity;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 对应数据库表(organization):
- */
-@Data
-public class Organization extends BaseEntity {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -8979746516597046410L;
-
-	/**  */
-	private Integer id;
-	
-	/** 机构名称 */
-	@ApiModelProperty(value = "机构名称",required = false)
-	private String name;
-
-	/** 机构名称 */
-	@ApiModelProperty(value = "区域名称",required = false)
-	private String areaName;
-	
-	/** 区域编码 */
-	@ApiModelProperty(value = "区域编码",required = false)
-	private Integer areaId;
-	
-	private String corporateName;
-	
-	private String corporateCode;
-	
-	private String corporateSeal;
-	
-	private String corporateFinancialSeal;
-	
-	private BigDecimal maxMusicalInstrumentsProfits;
-	
-	/** 创建时间 */
-	private Date createTime;
-	
-	/** 修改时间 */
-	private Date updateTime;
-
-	@ApiModelProperty(value = "成立日期",required = false)
-	private Date registerDate;
-
-	@ApiModelProperty(value = "联系人",required = false)
-	private String linkman;
-
-	@ApiModelProperty(value = "联系方式",required = false)
-	private String mobile;
-
-	@ApiModelProperty(value = "地址",required = false)
-	private String address;
-
-}

cms/src/main/java/com/ym/mec/cms/service/OrganizationService.java

@@ -1,21 +0,0 @@
-package com.ym.mec.cms.service;
-
-
-import com.ym.mec.cms.dal.entity.Organization;
-import com.ym.mec.common.service.BaseService;
-
-public interface OrganizationService extends BaseService<Integer, Organization> {
-
-    /**
-    * @description: 获取员工能访问的分部列表
-     * @param userId 当前用户
-     * @param organIds 用户选择的分部
-     * @param isSuper 是否超管
-    * @return java.lang.String
-    * @author zx
-    * @date 2022/1/5 12:44
-    */
-    String getEmployeeOrgan(Integer userId,String organIds,Boolean isSuper);
-
-
-}

cms/src/main/java/com/ym/mec/cms/service/impl/OrganizationServiceImpl.java

@@ -1,55 +0,0 @@
-package com.ym.mec.cms.service.impl;
-
-import com.ym.mec.cms.dal.dao.OrganizationDao;
-import com.ym.mec.cms.dal.entity.Organization;
-import com.ym.mec.cms.dal.entity.TenantInfo;
-import com.ym.mec.cms.service.OrganizationService;
-import com.ym.mec.cms.service.TenantInfoService;
-import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.common.service.impl.BaseServiceImpl;
-import com.ym.mec.common.tenant.TenantContextHolder;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-@Service
-public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organization> implements OrganizationService {
-
-	@Resource
-	private OrganizationDao organizationDao;
-	@Resource
-	private TenantInfoService tenantInfoService;
-
-	@Override
-	public BaseDAO<Integer, Organization> getDAO() {
-		return organizationDao;
-	}
-
-
-	@Override
-	public String getEmployeeOrgan(Integer userId, String organIds,Boolean isSuper) {
-		if(StringUtils.isEmpty(organIds)){
-			Integer tenantId = TenantContextHolder.getTenantId();
-			TenantInfo tenantInfo = tenantInfoService.get(tenantId);
-			//如果是超管，或者是机构管理员，可以查看当前机构所有分部数据
-			if(isSuper || (tenantInfo.getUserId() != null && tenantInfo.getUserId().equals(userId))){
-				Map<String,Object> param = new HashMap<>();
-				param.put("tenantId",tenantId);
-				List<Organization> all = this.findAll(param);
-				if(all != null && all.size() > 0){
-					organIds = StringUtils.join(all.stream().map(e->e.getId()).collect(Collectors.toSet()),",");
-				}
-			}
-		}
-		/*if(StringUtils.isEmpty(organIds)){
-			Employee employee = employeeDao.get(userId);
-			organIds = employee.getOrganIdList();
-		}*/
-		return organIds;
-	}
-}

cms/src/main/resources/config/mybatis/OrganizationMapper.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!--
-这个文件是自动生成的。
-不要修改此文件。所有改动将在下次重新自动生成时丢失。
--->
-<mapper namespace="com.ym.mec.biz.dal.dao.OrganizationDao">
-
-    <resultMap type="com.ym.mec.cms.dal.entity.Organization" id="Organization">
-        <result column="id_" property="id"/>
-        <result column="name_" property="name"/>
-        <result column="area_name_" property="areaName"/>
-        <result column="area_id_" property="areaId"/>
-        <result column="create_time_" property="createTime"/>
-        <result column="update_time_" property="updateTime"/>
-        <result column="register_date_" property="registerDate"/>
-        <result column="linkman_" property="linkman"/>
-        <result column="mobile_" property="mobile"/>
-        <result column="address_" property="address"/>
-        <result column="corporate_name_" property="corporateName"/>
-        <result column="corporate_code_" property="corporateCode"/>
-        <result column="corporate_seal_" property="corporateSeal"/>
-        <result column="corporate_financial_seal_" property="corporateFinancialSeal"/>
-        <result column="max_musical_instruments_profits_" property="maxMusicalInstrumentsProfits"/>
-        <result column="tenant_id_" property="tenantId"/>
-    </resultMap>
-
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="Organization">
-		SELECT * FROM organization WHERE id_ = #{id} 
-	</select>
-
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="Organization">
-		SELECT * FROM organization WHERE tenant_id_ = #{tenantId} AND del_flag_ = 0 ORDER BY id_
-	</select>
-</mapper>

cms/src/main/resources/config/mybatis/SysNewsInformationMapper.xml

@@ -361,4 +361,7 @@
 
 
     </select>
+	<select id="queryTeacherOrgan" resultType="java.lang.String">
+		select organ_id_ from teacher where id_ = #{userId}
+	</select>
 </mapper>