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

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

@@ -23,7 +23,7 @@ public interface SysEmployeePositionService extends BaseService<Integer, SysEmpl
     * @author zx
     * @date 2022/1/8 11:29
     */
-    Map<String, List<SimpleUserDto>> findOrganPosition(String organIds);
+    Map<String, List<SimpleUserDto>> findOrganPosition(String organIds, Integer tenantId);
 
     /**
     * @description: 查询当前用户是否只有指定角色

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

@@ -364,7 +364,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			saveData(indexBaseMonthDataDao.getMusicData(dayStr,tenantId), dayStr, IndexDataType.PROGRESS_MUSIC_GROUP_NUM, tenantId);
 		}
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(TRANSACTION_TEACHER_NUM)) {
-			Map<String, List<SimpleUserDto>> organPosition = employeePositionService.findOrganPosition(null);
+			Map<String, List<SimpleUserDto>> organPosition = employeePositionService.findOrganPosition(null, tenantId);
 			List<SimpleUserDto> transactionTeachers = organPosition.get(SysUserRoleEnum.JOIN_TEACHER.name());
 			Map<Integer, Integer> organTeacherNumMap = new HashMap<>();
 			for (SimpleUserDto transactionTeacher : transactionTeachers) {

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

@@ -51,8 +51,7 @@ public class SysEmployeePositionServiceImpl extends BaseServiceImpl<Integer, Sys
 	}
 
     @Override
-    public Map<String, List<SimpleUserDto>> findOrganPosition(String organIds) {
-		Integer tenantId = TenantContextHolder.getTenantId();
+    public Map<String, List<SimpleUserDto>> findOrganPosition(String organIds, Integer tenantId) {
 		List<SimpleUserDto> organPosition = sysEmployeePositionDao.findOrganPosition(organIds, tenantId);
 		if(organPosition != null && organPosition.size() > 0){
 			Map<Integer, List<SimpleUserDto>> collect = organPosition.stream().collect(Collectors.groupingBy(e -> e.getPositionId()));

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

@@ -3,6 +3,7 @@ package com.ym.mec.teacher.controller;
 import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.biz.service.SysEmployeePositionService;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +24,7 @@ public class SysEmployeePositionController extends BaseController {
     @ApiOperation(value = "获取分部下员工职位列表")
     @GetMapping("/findOrganPosition")
     public Object findAll(){
-        return succeed(employeePositionService.findOrganPosition(organizationService.getTeacherOrgan()));
+        Integer tenantId = TenantContextHolder.getTenantId();
+        return succeed(employeePositionService.findOrganPosition(organizationService.getTeacherOrgan(), tenantId));
     }
 }

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

@@ -3,6 +3,7 @@ package com.ym.mec.web.controller;
 import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.biz.service.SysEmployeePositionService;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +27,7 @@ public class SysEmployeePositionController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('employeePosition/findOrganPosition')")
     public Object findAll(String organIds) throws Exception {
         organIds = organizationService.getEmployeeOrgan(organIds);
-        return succeed(employeePositionService.findOrganPosition(organIds));
+        Integer tenantId = TenantContextHolder.getTenantId();
+        return succeed(employeePositionService.findOrganPosition(organIds, tenantId));
     }
 }