Merge branch 'zx_online_0213_contract' of http://git.dayaedu.com/yonge/cooleshow into develop-new

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ContractServiceImpl.java

@@ -170,10 +170,10 @@ public class ContractServiceImpl implements ContractService {
             organTsign = addTsign(0L, organCode, companyName);
         }
 
-        eSealPlugin.organSign(organTsign.getSealData(), srcPdfPath, srcPdfPath);
+        /*eSealPlugin.organSign(organTsign.getSealData(), srcPdfPath, srcPdfPath);
         if (sysUserTsign != null && CertificateTypeEnum.IDENTITY.getCode().equals(user.getCertificateType())) {
             eSealPlugin.userSign(sysUserTsign.getAccountId(), sysUserTsign.getSealData(), srcPdfPath, srcPdfPath);
-        }
+        }*/
 
         // 上传到oss
         String dateStrOss = dateFormatOss.format(date);

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/RoomServiceImpl.java

@@ -146,6 +146,10 @@ public class RoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNetworkRoom
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void display(ImNetworkDisplayDataDto displayData,String serviceProvider) throws Exception {
+        ImNetworkRoom room = baseMapper.findByRoomId(displayData.getRoomId());
+        if(room == null){
+            return;
+        }
         StringBuffer display = new StringBuffer("display://type=").append(displayData.getType().ordinal()).append("?userId=");
         switch (displayData.getType()) {
             case NONE:
@@ -163,7 +167,6 @@ public class RoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNetworkRoom
                 display.append(displayData.getTeacherId()).append("?uri=").append(displayData.getUri());
                 break;
         }
-        ImNetworkRoom room = baseMapper.findByRoomId(displayData.getRoomId());
         room.setDisplay(display.toString());
 
         ImNetworkRoomMember roomMember = imNetworkRoomMemberService.lambdaQuery()