Merge remote-tracking branch 'origin/developer' into developer

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

@@ -976,7 +976,7 @@ public class StaffApiServiceImpl implements StaffApiService {
             List<AccountTransferUserDTO> resultList = listServiceResponse.getResult();
             result.setTotalNum(resultList.size());
             for (AccountTransferUserDTO dto : resultList) {
-                if(Constant.SUCCESS.equals(dto.getErrcode())){
+                if(0==dto.getErrcode()){
                     //企微转移成功，好办staff表对应更新
                     successNum++;
                     TabHaobanStaff handoverStaff = collect.get(map.get(dto.getHandover_userid()));
@@ -984,7 +984,7 @@ public class StaffApiServiceImpl implements StaffApiService {
                     //置空转移成员的许可信息
                     staffMapper.updateStaffInfoByStaffId(handoverStaff.getStaffId(),null,null,null,0);
                     //更新接收成员的许可信息
-                    staffMapper.updateStaffInfoByStaffId(takeOverStaff.getStaffId(),takeOverStaff.getActiveTime(),takeOverStaff.getExpireTime(), takeOverStaff.getActiveCode(),1);
+                    staffMapper.updateStaffInfoByStaffId(takeOverStaff.getStaffId(),handoverStaff.getActiveTime(),handoverStaff.getExpireTime(), handoverStaff.getActiveCode(),1);
 
                 }else{
                     //企微转移失败,记录失败明细

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

@@ -632,7 +632,7 @@
              expire_time = #{expireTime},
              active_code = #{activeCode},
              active_status = #{activeStatus}
-        where wx_open_user_id = #{staffId}
+        where  staff_id= #{staffId}
     </update>
 
 </mapper>
\ No newline at end of file