Merge branch 'developer' into 'master'

feat: 回收站

See merge request !115

gic-cloud-data-hook-api/.flattened-pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.gic</groupId>
   <artifactId>gic-cloud-data-hook-api</artifactId>
-  <version>2.45</version>
+  <version>2.47</version>
   <dependencies>
     <dependency>
       <groupId>com.gic</groupId>

gic-cloud-data-hook-service/src/main/java/com/gic/cloud/data/hook/service/deal/queryfilter/ClerkCodeQueryFilter.java

@@ -34,7 +34,7 @@ public class ClerkCodeQueryFilter implements BaseQueryFilter {
 
     @Override
     public Page<FilterQueryDataDTO> pageQueryData(QueryFilterContext context) {
-        Page<ClerkDTO> clerkDTOPage = clerkService.pageUserBySearchName(context.getEnterpriseId(), context.getSearch(), context.getPageNum(), context.getPageSize());
+        Page<ClerkDTO> clerkDTOPage = clerkService.pageClerkByNameOrCode(context.getEnterpriseId(), context.getSearch(),null, context.getPageNum(), context.getPageSize());
         Page<FilterQueryDataDTO> ret =new Page<>();
         ret.setPageSize(context.getPageSize());
         ret.setCurrentPage(context.getPageNum());

gic-cloud-data-hook-service/src/main/java/com/gic/cloud/data/hook/service/deal/queryfilter/ClerkNameQueryFilter.java

@@ -34,7 +34,7 @@ public class ClerkNameQueryFilter implements BaseQueryFilter {
 
     @Override
     public Page<FilterQueryDataDTO> pageQueryData(QueryFilterContext context) {
-        Page<ClerkDTO> clerkDTOPage = clerkService.pageUserBySearchName(context.getEnterpriseId(), context.getSearch(), context.getPageNum(), context.getPageSize());
+        Page<ClerkDTO> clerkDTOPage = clerkService.pageClerkByNameOrCode(context.getEnterpriseId(), context.getSearch(),null, context.getPageNum(), context.getPageSize());
         Page<FilterQueryDataDTO> ret =new Page<>();
         ret.setPageSize(context.getPageSize());
         ret.setCurrentPage(context.getPageNum());