Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into saas

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

@@ -111,7 +111,7 @@ public class NewsController extends BaseController {
 	@GetMapping(value = "/queryPage")
 	public Object queryPage(NewsInformationQueryInfo queryInfo) {
 		
-		if(queryInfo.getType() == 6 || queryInfo.getType() == 7){
+		if(queryInfo.getType() != null && (queryInfo.getType() == 6 || queryInfo.getType() == 7)){
 			queryInfo.setTenantId(-1);
 		}
 		

cms/src/main/java/com/ym/mec/cms/interceptor/TenantInterceptor.java

@@ -29,7 +29,7 @@ public class TenantInterceptor extends HandlerInterceptorAdapter {
 		
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		
-		if(sysUser != null){
+		if(sysUser != null && sysUser.getId() != null){
 			TenantContextHolder.setTenantId(sysUser.getTenantId());
 			
 			TenantInfo tenantInfo = tenantInfoService.get(sysUser.getTenantId());

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

@@ -269,7 +269,7 @@
 				and find_in_set(#{subjectId},sni.subject_id_list_)
 			</if>
 			<if test="organId != null">
-				and (find_in_set(#{organId},sni.organ_id_list_) or sni.organ_id_list_ is null)
+				and (find_in_set(#{organId},sni.organ_id_list_) or sni.organ_id_list_ is null or sni.organ_id_list_ = '')
 			</if>
 		<if test="clientName != 'manage'">
 			<choose>

mec-teacher/src/main/java/com/ym/mec/teacher/controller/SysEmployeePositionController.java

@@ -6,7 +6,6 @@ import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -23,8 +22,7 @@ public class SysEmployeePositionController extends BaseController {
 
     @ApiOperation(value = "获取分部下员工职位列表")
     @GetMapping("/findOrganPosition")
-    @PreAuthorize("@pcs.hasPermissions('employeePosition/findOrganPosition')")
-    public Object findAll() throws Exception {
+    public Object findAll(){
         return succeed(employeePositionService.findOrganPosition(organizationService.getTeacherOrgan()));
     }
 }