问卷组推送广场调整提交

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/impl/BizQuestionGroupServiceImpl.java

@@ -7,6 +7,7 @@ import cn.hutool.crypto.digest.DigestUtil;
 import cn.tr.core.exception.ServiceException;
 import cn.tr.core.exception.TRExcCode;
 import cn.tr.core.strategy.LoginUserStrategy;
+import cn.tr.core.tenant.TenantContextHolder;
 import cn.tr.module.smart.common.dto.BizQuestionGroupDTO;
 import cn.tr.module.smart.common.dto.BizQuestionGroupQueryDTO;
 import cn.tr.module.smart.common.mapper.BizQuestionGroupMapper;
@@ -21,6 +22,8 @@ import cn.tr.module.smart.common.repository.BizQuestionGroupSquareRepository;
 import cn.tr.module.smart.common.repository.BizQuestionRepository;
 import cn.tr.module.smart.common.repository.BizQuestionSquareRepository;
 import cn.tr.module.smart.common.service.IBizQuestionGroupService;
+import cn.tr.module.sys.oauth2.LoginTypeConstant;
+import cn.tr.plugin.security.context.LoginUserContextHolder;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import org.apache.commons.lang3.StringUtils;
@@ -162,8 +165,10 @@ public class BizQuestionGroupServiceImpl implements IBizQuestionGroupService {
         if (CollectionUtil.isEmpty(bizQuestionPOS)) {
             throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001, "问卷组内容为空");
         }
+        String tenantId = TenantContextHolder.getTenantId();
         BizQuestionGroupSquarePO bizQuestionGroupSquarePO = bizQuestionGroupSquareRepository.selectOne(new LambdaQueryWrapper<BizQuestionGroupSquarePO>()
-                .eq(BizQuestionGroupSquarePO::getHospitalGroupId, id));
+                .eq(BizQuestionGroupSquarePO::getHospitalGroupId, id)
+                .eq(BizQuestionGroupSquarePO::getTenantId, tenantId));
         BizQuestionGroupSquarePO newBizQuestionGroupSquarePO = BizQuestionGroupSquareMapper.INSTANCE.convertPO(bizQuestionGroupPO);
         if(ObjectUtil.isNull(bizQuestionGroupSquarePO)){
             newBizQuestionGroupSquarePO.setCitationCount(0);

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/impl/BizQuestionGroupSquareServiceImpl.java

@@ -150,6 +150,7 @@ public class BizQuestionGroupSquareServiceImpl implements IBizQuestionGroupSquar
                 .eq(BizQuestionGroupPO::getMd5, bizQuestionGroupSquarePO.getMd5())
                 .eq(BizQuestionGroupPO::getTenantId, tenantId));
         BizQuestionGroupPO newBizQuestionGroupPO = BizQuestionGroupMapper.INSTANCE.convertQuestionGroupPO(bizQuestionGroupSquarePO);
+        newBizQuestionGroupPO.setSquareId(bizQuestionGroupSquarePO.getId());
         if(ObjectUtil.isNotNull(bizQuestionGroupPO)){
              //相同内容并且是自己医院问卷对问卷信息做更新
             newBizQuestionGroupPO.setId(bizQuestionGroupPO.getId());
@@ -167,7 +168,6 @@ public class BizQuestionGroupSquareServiceImpl implements IBizQuestionGroupSquar
             }).collect(Collectors.toList());
             bizQuestionServiceimpl.saveOrUpdateBatch(bizQuestionPOS);
         }else {
-            newBizQuestionGroupPO.setSquareId(bizQuestionGroupSquarePO.getId());
             bizQuestionGroupRepository.insert(newBizQuestionGroupPO);
             List<BizQuestionPO> bizQuestionPOS = bizQuestionSquarePOS.stream().map(bizQuestionSquarePO -> {
                 BizQuestionPO bizQuestionPO = BizQuestionMapper.INSTANCE.convertQuestionPO(bizQuestionSquarePO);