黄远 пре 5 година
родитељ
комит
b8dfcc0fc7

+ 6 - 0
lift-system-service/src/main/java/cn/com/ty/lift/system/settings/dao/entity/model/CompanyAttestationRequest.java

@@ -23,6 +23,12 @@ public class CompanyAttestationRequest {
      * 用户id
      */
     private Long userId;
+
+    /**
+     * 查询字段
+     */
+    private String queryCondition;
+
     /**
      * 当前用户id
      */

+ 5 - 2
lift-system-service/src/main/java/cn/com/ty/lift/system/settings/service/impl/MtCompanyAttestationServiceImpl.java

@@ -128,8 +128,11 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
         IPage<MtCompanyAttestation> mtCompanyAttestationPage = new Page<>(companyAttestationRequest.getPageNum(), companyAttestationRequest.getPageSize());
         mtCompanyAttestationPage = this.page(mtCompanyAttestationPage, new QueryWrapper<MtCompanyAttestation>()
                 .eq(currentUserId != null, "customer_manager_id", currentUserId)
-                .like(StringUtils.isNotBlank(companyAttestationRequest.getAttestationName()), "attestation_name",
-                        companyAttestationRequest.getAttestationName())
+                .or()
+                .like(StringUtils.isNotBlank(companyAttestationRequest.getQueryCondition()), "contacts_name",
+                        companyAttestationRequest.getQueryCondition())
+                .like(StringUtils.isNotBlank(companyAttestationRequest.getQueryCondition()), "contacts_tel",
+                        companyAttestationRequest.getQueryCondition())
         );
         return RestResponse.ok(mtCompanyAttestationPage, ApiConstants.RESULT_SUCCESS, "获取公司申请信息成功");
     }