Merge remote-tracking branch 'origin/developer-2023-02-15' into developer

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

@@ -148,7 +148,7 @@ public interface StaffMapper {
      */
     int updateActiveStatusById(@Param("staffId")String staffId, @Param("activeTime")Date activeTime, 
             @Param("expireTime")Date expireTime,
-            @Param("activeCode")String activeCode, @Param("activeStatus")Integer activeStatus);
+            @Param("activeCode")String activeCode);
     
     // 初始化激活码信息,先删除
     void deleteActivieInfo(@Param("wxEnterpriseId") String wxEnterpriseId) ;
@@ -183,7 +183,6 @@ public interface StaffMapper {
     void updateStaffInfoByStaffId(@Param("staffId") String staffId,
                                        @Param("activeTime")Date activeTime,
                                        @Param("expireTime")Date expireTime,
-                                       @Param("activeCode")String activeCode,
-                                       @Param("activeStatus")Integer activeStatus);
+                                       @Param("activeCode")String activeCode);
     
 }
\ No newline at end of file

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

@@ -140,7 +140,7 @@ public interface StaffService {
      * @return
      * @throws
      */
-    int updateActiveStatusById(String staffId,  Date activeTime, Date expireTime ,String activeCode ,Integer activeStatus);
+    int updateActiveStatusById(String staffId,  Date activeTime, Date expireTime ,String activeCode);
 
     void updateOpenConcatFlag(List<String> wxUserIdList,int mixFlag);
     

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

@@ -172,8 +172,8 @@ public class StaffServiceImpl implements StaffService {
     
     @Override
     public int updateActiveStatusById(String staffId,  Date activeTime, Date expireTime,
-            String activeCode, Integer activeStatus) {
-        return mapper.updateActiveStatusById(staffId, activeTime, expireTime, activeCode , activeStatus) ;
+            String activeCode) {
+        return mapper.updateActiveStatusById(staffId, activeTime, expireTime, activeCode) ;
     }
     
     @Override
@@ -244,7 +244,7 @@ public class StaffServiceImpl implements StaffService {
                 staff = this.mapper.getDeleteUser(userId, wxEnterpriseId) ;
             }
             if(null != staff) {
-                this.updateActiveStatusById(staff.getStaffId(), start, end, activeCode, 1) ;
+                this.updateActiveStatusById(staff.getStaffId(), start, end, activeCode) ;
             }else {
                 log.info("查询激活账号,用户不存在,userid={}",userId);
             }

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

@@ -981,9 +981,9 @@ public class StaffApiServiceImpl implements StaffApiService {
                     TabHaobanStaff handoverStaff = collect.get(map.get(dto.getHandover_userid()));
                     TabHaobanStaff takeOverStaff = collect.get(map.get(dto.getTakeover_userid()));
                     //置空转移成员的许可信息
-                    staffMapper.updateStaffInfoByStaffId(handoverStaff.getStaffId(),null,null,null,0);
+                    staffMapper.updateStaffInfoByStaffId(handoverStaff.getStaffId(),null,null,null);
                     //更新接收成员的许可信息
-                    staffMapper.updateStaffInfoByStaffId(takeOverStaff.getStaffId(),handoverStaff.getActiveTime(),handoverStaff.getExpireTime(), handoverStaff.getActiveCode(),1);
+                    staffMapper.updateStaffInfoByStaffId(takeOverStaff.getStaffId(),handoverStaff.getActiveTime(),handoverStaff.getExpireTime(), handoverStaff.getActiveCode());
 
                 }else{
                     //企微转移失败,记录失败明细