zouxuan 5 years ago
parent
commit
6839993812

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

@@ -41,6 +41,9 @@ public interface EmployeeDao extends BaseDAO<Integer, Employee> {
      */
     int updateUserLockStatus(@Param("userID") Long userID);
 
+
+    void updateUserLock(@Param("userID") Long userID, @Param("status") int status);
+
     /**
      * @Author: Joburgess
      * @Date: 2019/9/25

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

@@ -151,9 +151,11 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 				employeeDao.updateUserLockStatus(employeeId);
 				break;
 			case DEMISSION:
-				//冻结用户
-				employeeDao.updateUserLockStatus(employeeId);
 				employeeDao.updateUserDemissionDate(employeeId);
+				Employee employee = employeeDao.get(employeeId.intValue());
+				if(employee.getDemissionDate() != null){
+					employeeDao.updateUserLock(employeeId,1);
+				}
 				break;
 			case REINSTATE:
 				employeeDao.updateUserDemissionDate(employeeId);

+ 3 - 0
mec-biz/src/main/resources/config/mybatis/EmployeeMapper.xml

@@ -144,6 +144,9 @@
     <update id="updateUserDemissionDate">
         UPDATE employee SET demission_date_ = IF(demission_date_ IS NULL,now(),NULL) WHERE user_id_=#{userID}
     </update>
+    <update id="updateUserLock">
+        UPDATE sys_user SET lock_flag_ = #{status} WHERE id_=#{userID}
+    </update>
 
     <!-- 根据主键删除一条记录 -->
     <delete id="delete">