合同样品单增加状态搜索定位搜索

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -268,11 +268,12 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
      */
     private Page<ContractVo> pageCommon(ContractSelectDto dto, IWrapper<Contract> wrapper) {
         wrapper.orderByDesc("t1", Contract::getCreateTime);
-        wrapper.eq("t1", Contract::getIsChange, "0");//列表只展示未变更得数据
-        wrapper.ne("t1", Contract::getIsShow, 1);
-        wrapper.between("t1", Contract::getStatus, FlowStatusEnum1.DRAFT.getKey(), FlowStatusEnum1.CANCELLATION.getKey() - 1);
         if (StringUtils.isNotEmpty(dto.getStatus())) {
             wrapper.eq("t1", Contract::getStatus, dto.getStatus());
+        }else{
+            wrapper.eq("t1", Contract::getIsChange, "0");//列表只展示未变更得数据
+            wrapper.ne("t1", Contract::getIsShow, 1);
+            wrapper.between("t1", Contract::getStatus, FlowStatusEnum1.DRAFT.getKey(), FlowStatusEnum1.CANCELLATION.getKey() - 1);
         }
         if (StringUtils.isNotEmpty(dto.getUserId())) {
             wrapper.eq("t1", Contract::getCreateUser, dto.getUserId());

hx-sale/src/main/java/com/fjhx/sale/service/sample/impl/SampleServiceImpl.java

@@ -148,11 +148,12 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
 
     public Page<SampleVo> pageCommon(SampleSelectDto dto, IWrapper<Sample> wrapper){
         wrapper.orderByDesc("t1", Sample::getCreateTime);
-        wrapper.eq("t1", Sample::getIsChange, "0");//列表只展示未变更得数据
-        wrapper.ne("t1",Sample::getIsShow,1);
-        wrapper.between("t1", Sample::getStatus, FlowStatusEnum1.DRAFT.getKey(), FlowStatusEnum1.CANCELLATION.getKey() - 1);
         if (StringUtils.isNotEmpty(dto.getStatus())) {
             wrapper.eq("t1", Sample::getStatus, dto.getStatus());
+        }else{
+            wrapper.eq("t1", Sample::getIsChange, "0");//列表只展示未变更得数据
+            wrapper.ne("t1",Sample::getIsShow,1);
+            wrapper.between("t1", Sample::getStatus, FlowStatusEnum1.DRAFT.getKey(), FlowStatusEnum1.CANCELLATION.getKey() - 1);
         }
         if (StringUtils.isNotEmpty(dto.getUserId())) {
             wrapper.eq("t1", Sample::getCreateUser, dto.getUserId());