已离职成员激活账号

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/StaffMapper.java

@@ -22,6 +22,8 @@ public interface StaffMapper {
     
     TabHaobanStaff selectByUserIdAndEnterpriseId(@Param("userId") String userId,  @Param("wxEnterpriseId") String wxEnterpriseId);
     
+    TabHaobanStaff getDeleteUser(@Param("userId") String userId,  @Param("wxEnterpriseId") String wxEnterpriseId) ;
+    
     List<TabHaobanStaff> listByUserIdsAndWxEnterpriseId(@Param("userIds") List<String> userIds, @Param("wxEnterpriseId") String wxEnterpriseId);
 
     

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffServiceImpl.java

@@ -223,6 +223,9 @@ public class StaffServiceImpl implements StaffService {
             Date start = new Date(item.getActiveTime()*1000L) ;
             Date end = new Date(item.getExpireTime()*1000L) ;
             TabHaobanStaff staff = this.mapper.selectByUserIdAndEnterpriseId(userId, wxEnterpriseId) ;
+            if(null == staff && end.getTime()>System.currentTimeMillis()) {
+                staff = this.mapper.getDeleteUser(userId, wxEnterpriseId) ;
+            }
             if(null != staff) {
                 this.updateActiveStatusById(staff.getStaffId(), start, end, new Date(), 1) ;
             }else {

haoban-manage3-service/src/main/resources/mapper/StaffMapper.xml

@@ -349,6 +349,16 @@
         and wx_enterprise_id = #{wxEnterpriseId}
         and status_flag = 1 limit 1
     </select>
+    
+    <select id="getDeleteUser" resultMap="BaseResultMap">
+    	select
+        <include refid="Base_Column_List"/>
+        from tab_haoban_staff
+        where (wx_user_id = #{userId,jdbcType=VARCHAR} or wx_open_user_id = #{userId,jdbcType=VARCHAR})
+        and wx_enterprise_id = #{wxEnterpriseId}
+        and status_flag = 0 order by create_time desc limit 1
+    </select>
+    
 
     <select id="listByUserIdsAndWxEnterpriseId" resultMap="BaseResultMap">
         select