yonge пре 3 година
родитељ
комит
61791aaac5

+ 3 - 0
mec-biz/src/main/resources/config/mybatis/MusicGroupMapper.xml

@@ -264,6 +264,9 @@
             <if test="transactionTeacherId!=null">
                 AND transaction_teacher_id_ = #{transactionTeacherId}
             </if>
+            <if test="educationalTeacherId!=null">
+                AND educational_teacher_id_ = #{educationalTeacherId}
+            </if>
             <if test="courseViewType != null">
                 AND course_view_type_ = #{courseViewType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>

+ 10 - 0
mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupController.java

@@ -2,6 +2,7 @@ package com.ym.mec.web.controller;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.auth.api.entity.SysUserRole;
 import com.ym.mec.biz.dal.dao.EmployeeDao;
 import com.ym.mec.biz.dal.dto.CloseMusicGroupDto;
 import com.ym.mec.biz.dal.dto.MusicGroupRegsDto;
@@ -20,10 +21,12 @@ import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.yonge.log.model.AuditLogAnnotation;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -120,6 +123,13 @@ public class MusicGroupController extends BaseController {
 				return failed("非法请求");
 			}
 		}
+		if (sysUser.getIsSuperAdmin() == false) {
+			List<Integer> userRole = employeeDao.queryUserRole(sysUser.getId());
+			// 如果当前用户只有教务老师角色,那么只能看到他所管理的课程组的信息
+			if (userRole != null && userRole.size() == 1 && userRole.contains(SysUserRole.EDUCATIONAL_TEACHER)) {
+				queryInfo.setEducationalTeacherId(sysUser.getId());
+			}
+		}
 		return succeed(musicGroupService.queryMusicGroupPage(queryInfo));
 	}