Merge branch 'guiq-fixbug' into 'master'

fix bug

See merge request rays/pcloud-book!725

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/GroupQrcodeBizImpl.java

@@ -65,6 +65,7 @@ import com.pcloud.wechatgroup.group.dto.GroupRobotDTO;
 import com.pcloud.wechatgroup.group.service.GroupMemberService;
 import com.sdk.wxgroup.GroupInfoVO;
 import com.sdk.wxgroup.WxGroupSDK;
+import com.sdk.wxgroup.im.mimc.BusinessConstant;
 import com.sdk.wxgroup.im.mimc.dto.SendMomentsDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.MapUtils;
@@ -934,7 +935,7 @@ public class GroupQrcodeBizImpl implements GroupQrcodeBiz {
             if (!ListUtils.isEmpty(users)) {
                 List<WxUserVO> managers = new ArrayList<>(3);
                 for (GroupManagerDTO user : users) {
-                    if (item.getMaster() != null && user.getIsMaster() == 1) {
+                    if (item.getMaster() == null && user.getIsMaster() == 1) {
                         item.setMaster(new WxUserVO(user.getWxUserId(), user.getNickName(), user.getHeadPic()));
                     } else {
                         managers.add(new WxUserVO(user.getWxUserId(), user.getNickName(), user.getHeadPic()));
@@ -977,6 +978,7 @@ public class GroupQrcodeBizImpl implements GroupQrcodeBiz {
         momentsDTO.setId(Long.valueOf(updateRoomManagerVO.getType()));
         // IP
         momentsDTO.setIp(bookWxQrcodeDTO.getWechatGroupIp());
+        momentsDTO.setMomentType(BusinessConstant.MomentTypeEnum.SET_GROUP_ADMIN);
         WxGroupSDK.sendMessageToPhone(momentsDTO);
     }
 }