update

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/EmployeeDao.java

@@ -32,24 +32,24 @@ public interface EmployeeDao extends BaseDAO<Integer, Employee> {
      * @param userID
      * @param password
      */
-    void updatePassword(@Param("userID") Long userID, @Param("password") String password);
+    void updatePassword(@Param("userID") Integer userID, @Param("password") String password);
 
     /**
      * @Author: Joburgess
      * @Date: 2019/9/17
      * 修改用户账户锁定状态
      */
-    int updateUserLockStatus(@Param("userID") Long userID);
+    int updateUserLockStatus(@Param("userID") Integer userID);
 
 
-    void updateUserLock(@Param("userID") Long userID, @Param("status") int status);
+    void updateUserLock(@Param("userID") Integer userID, @Param("status") int status);
 
     /**
      * @Author: Joburgess
      * @Date: 2019/9/25
      * 修改用户离职日期
      */
-    int updateUserDemissionDate(@Param("userID") Long userID);
+    int updateUserDemissionDate(@Param("userID") Integer userID);
     /**
      * 根据手机号查询对象
      * @param phone

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

@@ -24,7 +24,7 @@ public interface EmployeeService extends BaseService<Integer, Employee> {
      * @Date: 2019/9/17
      * 员工操作
      */
-    void employeeOperate(Long employeeId, EmployeeOperateEnum operate);
+    void employeeOperate(Integer employeeId, EmployeeOperateEnum operate);
 
     /**
      * 新增员工

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

@@ -142,14 +142,14 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 	}
 
 	@Override
-	public void employeeOperate(Long employeeId, EmployeeOperateEnum operate) {
-		Employee employee = employeeDao.get(employeeId.intValue());
+	public void employeeOperate(Integer employeeId, EmployeeOperateEnum operate) {
+		Employee employee = employeeDao.get(employeeId);
 		switch (operate){
 			case RESET_PASSWORD:
 				employeeDao.updatePassword(employeeId,new BCryptPasswordEncoder().encode(ParamEnum.INIT_PASSWORD.getCode().toString()));
 				break;
 			case LOCK_UNLOCK:
-				SysUser sysUser = sysUserFeignService.queryUserById(employee.getUserId());
+				SysUser sysUser = sysUserFeignService.queryUserById(employeeId);
 				if(employee != null && employee.getDemissionDate() != null && sysUser.getLockFlag() == 1){
 					throw new BizException("操作失败：离职员工不允许解冻");
 				}

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

@@ -69,7 +69,7 @@ public class EmployeeController extends BaseController {
     @ApiOperation(value = "员工操作")
     @PostMapping("/employeeOperate")
     @PreAuthorize("@pcs.hasPermissions('employee/employeeOperate')")
-    public Object employeeOperate(Long employeeId, EmployeeOperateEnum operate){
+    public Object employeeOperate(Integer employeeId, EmployeeOperateEnum operate){
         employeeService.employeeOperate(employeeId,operate);
         return succeed();
     }