Merge branch 'feature/0427-school' into master_saas

mec-web/src/main/java/com/ym/mec/web/controller/school/SchoolStaffController.java

@@ -11,6 +11,7 @@ import com.ym.mec.biz.dal.entity.SchoolStaff;
 import com.ym.mec.biz.dal.enums.ParamEnum;
 import com.ym.mec.biz.dal.wrapper.SchoolStaffWrapper;
 import com.ym.mec.biz.service.CooperationOrganService;
+import com.ym.mec.biz.service.EmployeeService;
 import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.biz.service.SchoolStaffService;
 import com.ym.mec.common.controller.BaseController;
@@ -57,6 +58,9 @@ public class SchoolStaffController extends BaseController {
     @Autowired
     private OrganizationService organizationService;
 
+    @Autowired
+    private EmployeeService employeeService;
+
 	@ApiOperation(value = "详情", notes = "学校员工-根据详情ID查询单条, 传入id")
     @PreAuthorize("@pcs.hasPermissions('schoolStaff/detail')")
     @GetMapping("/detail/{id}")
@@ -250,4 +254,10 @@ public class SchoolStaffController extends BaseController {
         return succeed();
     }
 
+    @ApiOperation(value = "密码重置")
+    @PostMapping("/resetPassword")
+    public HttpResponseResult resetPassword(Integer userId){
+        employeeService.resetPassword(userId);
+        return succeed();
+    }
 }