From 3c30fbe42c95bfc5a48768b26c3a3f8e38a7cfdc Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期三, 26 七月 2023 17:42:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/controller/CityController.java | 1 +
cloud-server-account/src/main/java/com/dsh/account/feignclient/model/CityListQuery.java | 18 ++++++++++++++++++
2 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/CityController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/CityController.java
index 83e4a1e..0208ed9 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/CityController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/CityController.java
@@ -44,6 +44,7 @@
try {
Page<TCityManager> page = new Page<>(listQuery.getOffset(), listQuery.getLimit());
LambdaQueryWrapper<TCityManager> tCityManagerLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ tCityManagerLambdaQueryWrapper.ne(TCityManager::getState,3);
if(ToolUtil.isNotEmpty(listQuery.getProvinceCode())){
tCityManagerLambdaQueryWrapper.eq(TCityManager::getProvinceCode,listQuery.getProvinceCode());
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/model/CityListQuery.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/model/CityListQuery.java
new file mode 100644
index 0000000..3d658c0
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/model/CityListQuery.java
@@ -0,0 +1,18 @@
+package com.dsh.account.feignclient.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CityListQuery {
+ private long limit;
+ private long offset;
+ private String provinceCode;
+ private String cityCode;
+ private String name;
+ private String phone;
+
+}
--
Gitblit v1.7.1