update

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,7 +1049,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) {
@@ -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-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("获取用户信息失败");
     }