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

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

@@ -472,6 +472,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void simpleUpdate(Employee employee) {
+		employee.setUserId(employee.getId());
 		employee.setUpdateTime(new Date());
 		if(StringUtils.isNotEmpty(employee.getPhone())){
 			SysUser sysUser = teacherDao.getUserWithPhone(employee.getPhone());

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

@@ -122,7 +122,6 @@ public class EmployeeController extends BaseController {
     @PostMapping("/simpleUpdate")
     @PreAuthorize("@pcs.hasPermissions('employee/simpleUpdate')")
     public Object simpleUpdate(@RequestBody Employee employee) {
-
         employeeService.simpleUpdate(employee);
         return succeed();
     }

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

@@ -26,11 +26,11 @@ public class SysEmployeePositionController extends BaseController {
     @ApiOperation(value = "获取分部下员工职位列表")
     @GetMapping("/findOrganPosition")
     @PreAuthorize("@pcs.hasPermissions('employeePosition/findOrganPosition')")
-    public Object findAll(String organIds) throws Exception {
-        if(StringUtils.isEmpty(organIds)){
-            organIds = organizationService.getEmployeeOrgan(organIds);
+    public Object findAll(String id) throws Exception {
+        if(StringUtils.isEmpty(id)){
+            id = organizationService.getEmployeeOrgan(id);
         }
         Integer tenantId = TenantContextHolder.getTenantId();
-        return succeed(employeePositionService.findOrganPosition(organIds, tenantId));
+        return succeed(employeePositionService.findOrganPosition(id, tenantId));
     }
 }