From 72aaf45389cd09c206ee1b90f0c7f5bf59782930 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 22 十月 2025 18:27:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysOrderController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysOrderController.java
index 206b2b6..96660c1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysOrderController.java
@@ -85,11 +85,11 @@
public R<List<TSysAppUser>> pageList(@RequestBody TSysAppUserQuery query) {
LambdaQueryWrapper<TSysAppUser> eq = new LambdaQueryWrapper<TSysAppUser>().eq(TSysAppUser::getStatus, 1);
if(query.getNickName() != null && !query.getNickName().isEmpty()){
- eq.like(TSysAppUser::getNickName, query.getNickName());
+ eq.and(e->e.like(TSysAppUser::getNickName, query.getNickName()).or().like(TSysAppUser::getPhone, query.getNickName()));
}
- if(query.getPhone() != null && !query.getPhone().isEmpty()){
- eq.like(TSysAppUser::getPhone, query.getPhone());
- }
+// if(query.getPhone() != null && !query.getPhone().isEmpty()){
+// eq.like(TSysAppUser::getPhone, query.getPhone());
+// }
List<TSysAppUser> list = sysAppUserService.list(eq);
return R.ok(list);
}
@@ -106,7 +106,7 @@
TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
.eq(TCrmClinic::getUserId, user.getUserId())
.last("LIMIT 1"));
- sysOrderService.add(dto,crmClinic);
+ sysOrderService.add(dto,crmClinic,user.getNickName(),user.getUserId().toString());
return R.ok("添加成功");
}
return R.fail("添加失败");
--
Gitblit v1.7.1