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

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

@@ -923,7 +923,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 			throw new BizException("机构配置信息查询失败");
 		}
 		
-		params.put("compayName", tenantInfo.getName());
+		params.put("compayName", tenantInfo.getTsignName());
 		params.put("sealPicture", tenantConfig.getCorporateChops());
         
 		if (studentInfo.getTenantId() == 1) {
@@ -1049,13 +1049,13 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 			throw new BizException("机构配置信息查询失败");
 		}
 		
-		params.put("compayName", tenantInfo.getName());
+		params.put("compayName", tenantInfo.getTsignName());
 		params.put("sealPicture", tenantConfig.getCorporateChops());
         
 		if (studentInfo.getTenantId() == 1) {
 			if (OwnershipType.OWN.name().equals(params.get("ownershipType"))) {
-				params.put("compayName", "深圳大雅乐盟网络教育股份有限公司");
-				params.put("sealPicture", "https://daya-online.oss-cn-beijing.aliyuncs.com/website/cachet.png");
+				//params.put("compayName", "深圳大雅乐盟网络教育股份有限公司");
+				//params.put("sealPicture", "https://daya-online.oss-cn-beijing.aliyuncs.com/website/cachet.png");
 			} else {
 				params.put("compayName", "武汉长乐长风乐器销售有限公司");
 				params.put("sealPicture", "https://daya-online.oss-cn-beijing.aliyuncs.com/website/clcf.png");
@@ -1143,7 +1143,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 			throw new BizException("机构配置信息查询失败");
 		}
 		
-		params.put("compayName", tenantInfo.getName());
+		params.put("compayName", tenantInfo.getTsignName());
 		params.put("sealPicture", tenantConfig.getCorporateChops());
         
 		if (studentInfo.getTenantId() == 1) {

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

@@ -2148,7 +2148,11 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                 if(CollectionUtils.isEmpty(teacherSalary.getDeductReasons())){
                     teacherIncomeInfo.setDeductReasons(Collections.EMPTY_LIST);
                 }
-                teacherIncomeInfo.setTeacherAttendance(teacherAttendances.get(0));
+				if (teacherAttendances == null || teacherAttendances.size() == 0) {
+					teacherIncomeInfo.setTeacherAttendance(new TeacherAttendance());
+				} else {
+					teacherIncomeInfo.setTeacherAttendance(teacherAttendances.get(0));
+				}
                 if(Objects.nonNull(school)&&Objects.nonNull(teacherIncomeInfo.getTeacherAttendance())){
                     teacherIncomeInfo.getTeacherAttendance().setSchoolLongitudeLatitude(school.getLongitudeLatitude());
                 }

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

@@ -822,7 +822,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
     public PageInfo<EduOrganStudentDataDto> queryOrganStudentOverView(List<Integer> organIds, OrganCloudStudyStudentDataQueryInfo queryInfo) {
         PageInfo<EduOrganStudentDataDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 
-        if(StringUtils.isNotBlank(queryInfo.getOrganIds())&&CollectionUtils.isEmpty(organIds)){
+        if(StringUtils.isNotBlank(queryInfo.getOrganIds())&&(organIds == null || organIds.size() == 0)){
             return pageInfo;
         }
         Integer tenantId = TenantContextHolder.getTenantId();

mec-student/src/main/java/com/ym/mec/student/controller/StudentManageController.java

@@ -153,6 +153,7 @@ public class StudentManageController extends BaseController {
 		student.setRealName(user.getRealName());
 		student.setIdCardNo(user.getIdCardNo());
 		student.setImToken(user.getImToken());
+		student.setOrganId(user.getOrganId());
 		
 		if(StringUtils.isNotBlank(student.getSubjectIdList())){
 			List<Subject> subjectList = subjectService.findBySubjectByIdList(student.getSubjectIdList());

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

@@ -152,23 +152,23 @@ public class EmployeeController extends BaseController {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(sysUser != null && sysUser.getId() != null){
             Employee employee = employeeService.get(sysUser.getId());
-            sysUser.setOrganName(organizationService.getOrganName(employee.getOrganIdList()));
-            sysUser.setRoles(employeeDao.queryUserRole(sysUser.getId()));
-            sysUser.setContactAddress(employee.getContactAddress());
-            sysUser.setPostalCode(employee.getPostalCode());
-            sysUser.setDeptId(employee.getDeptId());
-            sysUser.setDeptIds(employee.getDeptIds());
-            sysUser.setPostIds(employee.getPostIds());
-            sysUser.setBankCard(employee.getBankCard());
-            sysUser.setOpenBankAddress(employee.getOpenBankAddress());
-            sysUser.setPostDeptIds(employee.getPostDeptIds());
+            employee.setOrganName(organizationService.getOrganName(employee.getOrganIdList()));
+            employee.setRoles(employeeDao.queryUserRole(sysUser.getId()));
+            employee.setContactAddress(employee.getContactAddress());
+            employee.setPostalCode(employee.getPostalCode());
+            employee.setDeptId(employee.getDeptId());
+            employee.setDeptIds(employee.getDeptIds());
+            employee.setPostIds(employee.getPostIds());
+            employee.setBankCard(employee.getBankCard());
+            employee.setOpenBankAddress(employee.getOpenBankAddress());
+            employee.setPostDeptIds(employee.getPostDeptIds());
             
             List<SysEmployeePositionDto> sysEmployeePositionDtoList = sysEmployeePositionService.queryByUserId(sysUser.getId());
             if(sysEmployeePositionDtoList != null && sysEmployeePositionDtoList.size() > 0){
-                sysUser.setPositions(StringUtils.join(sysEmployeePositionDtoList.stream().map(SysEmployeePositionDto :: getRoleId).collect(Collectors.toSet()),","));
-            	sysUser.setPositionName(sysEmployeePositionDtoList.stream().map(SysEmployeePositionDto :: getPositionName).collect(Collectors.joining(",")));
+            	employee.setPositions(StringUtils.join(sysEmployeePositionDtoList.stream().map(SysEmployeePositionDto :: getRoleId).collect(Collectors.toSet()),","));
+            	employee.setPositionName(sysEmployeePositionDtoList.stream().map(SysEmployeePositionDto :: getPositionName).collect(Collectors.joining(",")));
             }
-            return succeed(sysUser);
+            return succeed(employee);
         }
         return failed("获取用户信息失败");
     }