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

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FeedbackSuggestionsServiceImpl.java

@@ -114,7 +114,6 @@ public class FeedbackSuggestionsServiceImpl extends BaseService<FeedbackSuggesti
         if (!companyType.equals("监管机构")) {
             result = this.lambdaQuery()
                     .eq(FeedbackSuggestions::getCompanyCode, company.getCompanyCode())
-                    .eq(FeedbackSuggestions::getIsDelete, Boolean.FALSE)
                     .eq(!ValidationUtil.isEmpty(status), FeedbackSuggestions::getStatus, status)
                     .orderByDesc(FeedbackSuggestions::getCreateDate)
                     .page(page);
@@ -123,7 +122,6 @@ public class FeedbackSuggestionsServiceImpl extends BaseService<FeedbackSuggesti
         if (companyType.equals("监管机构")) {
             result = this.lambdaQuery()
                     .likeRight(FeedbackSuggestions::getSuperviseOrgCode, company.getOrgCode())
-                    .eq(FeedbackSuggestions::getIsDelete, Boolean.FALSE)
                     .eq(!ValidationUtil.isEmpty(status), FeedbackSuggestions::getStatus, status)
                     .orderByDesc(FeedbackSuggestions::getCreateDate)
                     .page(page);