From 2d75d376d5bb41958a4b152ad02b9164e94b4129 Mon Sep 17 00:00:00 2001 From: wuwenxiong <646448316@qq.com> Date: Thu, 16 Sep 2021 16:11:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F-=E8=B4=A6=E6=88=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E5=AE=A2=E6=88=B7=E8=B4=A6=E6=88=B7-=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=97=B6=E5=8A=A0=E5=85=A5=E5=AE=A2=E6=88=B7=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=B8=8B=E6=8B=89=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../local/ssjygl/system/sysuser/SysuserController.java | 4 ++-- .../ssjygl/system/sysuser/SysuserSyncService.java | 10 +++++----- .../ssjygl/system/sysuser/SysuserController.java | 4 ++-- .../ssjygl/system/sysuser/SysuserSyncService.java | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserController.java index b3bdb8d..e47c223 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserController.java @@ -41,9 +41,9 @@ public class SysuserController extends Controller { Integer del = getInt("del", Const.LOGIC_DEL_VALID); // 默认显示未删除的 Integer type = getInt("type"); Integer entity_id = getInt("entity_id"); - Integer customer_type = getInt("customer_type"); + Integer customer_type_id = getInt("customer_type_id"); String customer_name = get("customer_name"); - renderJson(Result.object(SysuserSyncService.me.find(pp, name, phone, del, type, entity_id, customer_type, customer_name))); + renderJson(Result.object(SysuserSyncService.me.find(pp, name, phone, del, type, entity_id, customer_type_id, customer_name))); } /** diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserSyncService.java index 759022f..9f5b3cf 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserSyncService.java @@ -295,7 +295,7 @@ public class SysuserSyncService extends BaseService { return sysuser; } - public Page find(PageParam pp, String name, String phone, Integer del, Integer type, Integer entity_id, Integer customer_type, String customer_name) { + public Page find(PageParam pp, String name, String phone, Integer del, Integer type, Integer entity_id, Integer customer_type_id, String customer_name) { List paraList = new ArrayList<>(); StringBuilder sqlbuf = new StringBuilder(); sqlbuf.append(" from (\n"); @@ -319,7 +319,7 @@ public class SysuserSyncService extends BaseService { sqlbuf.setLength(0); sqlbuf.append(" from ( \n"); sqlbuf.append(" select \n"); - sqlbuf.append(" u.id, u.phone, u.name, u.type, u.del, u.entity_id, c.name customer_name, c.texpayer_name, c.invoice_type, t.id customer_type, t.name customer_type_name \n"); + sqlbuf.append(" u.id, u.phone, u.name, u.type, u.del, u.entity_id, c.name customer_name, c.texpayer_name, c.invoice_type, t.id customer_type_id, t.name customer_type_name \n"); sqlbuf.append(" from sysuser u \n"); sqlbuf.append(" left join customer c on u.entity_id = c.id\n"); sqlbuf.append(" left join customer_type t on c.customer_type_id = t.id\n"); @@ -330,9 +330,9 @@ public class SysuserSyncService extends BaseService { paraList.add("%" + customer_name.trim() + "%"); } - if (customer_type != null && customer_type >= 0) { - sqlbuf.append(" and a.customer_type = ? \n"); - paraList.add(customer_type); + if (customer_type_id != null && customer_type_id >= 0) { + sqlbuf.append(" and a.customer_type_id = ? \n"); + paraList.add(customer_type_id); } } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserController.java index f09b3c3..79014db 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserController.java @@ -153,9 +153,9 @@ public class SysuserController extends Controller { Integer del = getInt("del", Const.LOGIC_DEL_VALID); // 默认显示未删除的 Integer type = getInt("type"); Integer entity_id = getInt("entity_id"); - Integer customer_type = getInt("customer_type"); + Integer customer_type_id = getInt("customer_type_id"); String customer_name = get("customer_name"); - renderJson(Result.object(SysuserSyncService.me.find(pp, name, phone, del, type, entity_id, customer_type, customer_name))); + renderJson(Result.object(SysuserSyncService.me.find(pp, name, phone, del, type, entity_id, customer_type_id, customer_name))); } /** diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserSyncService.java index f773492..aa3c377 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserSyncService.java @@ -817,7 +817,7 @@ public class SysuserSyncService extends BaseSyncService { return sysuser; } - public Page find(PageParam pp, String name, String phone, Integer del, Integer type, Integer entity_id, Integer customer_type, String customer_name) { + public Page find(PageParam pp, String name, String phone, Integer del, Integer type, Integer entity_id, Integer customer_type_id, String customer_name) { List paraList = new ArrayList<>(); StringBuilder sqlbuf = new StringBuilder(); @@ -842,7 +842,7 @@ public class SysuserSyncService extends BaseSyncService { sqlbuf.setLength(0); sqlbuf.append(" from ( \n"); sqlbuf.append(" select \n"); - sqlbuf.append(" u.id, u.phone, u.name, u.type, u.del, u.entity_id, c.name customer_name, c.texpayer_name, c.invoice_type, t.id customer_type, t.name customer_type_name \n"); + sqlbuf.append(" u.id, u.phone, u.name, u.type, u.del, u.entity_id, c.name customer_name, c.texpayer_name, c.invoice_type, t.id customer_type_id, t.name customer_type_name \n"); sqlbuf.append(" from sysuser u \n"); sqlbuf.append(" left join customer c on u.entity_id = c.id\n"); sqlbuf.append(" left join customer_type t on c.customer_type_id = t.id\n"); @@ -853,9 +853,9 @@ public class SysuserSyncService extends BaseSyncService { paraList.add("%" + customer_name.trim() + "%"); } - if (customer_type != null && customer_type >= 0) { - sqlbuf.append(" and a.customer_type = ? \n"); - paraList.add(customer_type); + if (customer_type_id != null && customer_type_id >= 0) { + sqlbuf.append(" and a.customer_type_id = ? \n"); + paraList.add(customer_type_id); } }