From afa3bc1e2f39f66f59ee9b15d6af16593acdc9a4 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 02 十二月 2023 10:38:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java b/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
index 9838888..acba7ea 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
@@ -112,9 +112,11 @@
convert(param, wrapper);
allLike(PriOnline2.class, param.keySet(), wrapper, condition);
wrapper.or().eq("member_id", getUserId());
- if (!Cools.isEmpty(orderByField)) {
- wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
- }
+// if (!Cools.isEmpty(orderByField)) {
+// wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+// }
+ wrapper.orderBy("update_time",false);
+ wrapper.orderBy("create_time",false);
return R.ok(priOnline2Service.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -157,7 +159,7 @@
}
if (!signUserId && !signDeptId) {
if (getRole().getId() == 1) {
- wrapper.or().eq("host_id", 1);
+ wrapper.or().eq("host_id", getHostId());
} else if (getRole().getId() == 2) {
wrapper.eq("dept_id", getDeptId());
} else {
@@ -165,7 +167,7 @@
}
}
if (signHostId) {
- wrapper.or().eq("host_id", 1);
+ wrapper.or().eq("host_id", getHostId());
}
}
@@ -625,7 +627,7 @@
} catch (Exception e) {
return R.error("鑷姩鐢熸垚鎶ヤ环鍗曞け璐�");
}
- if (!smsCodeService.sendSmsCodeText(manager.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E)) {
+ if (!smsCodeService.sendSmsCodeText(manager.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E,getUserId())) {
return R.ok("瀹℃壒鎴愬姛浣嗙煭淇″彂閫佸け璐�!");
}
}else {
@@ -639,7 +641,7 @@
}
}else {
User phoneUser = userService.selectById(nextUserId);
- if (!smsCodeService.sendSmsCodeText(phoneUser.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E)) {
+ if (!smsCodeService.sendSmsCodeText(phoneUser.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E,getUserId())) {
return R.ok("瀹℃壒鎴愬姛浣嗙煭淇″彂閫佸け璐�!");
}
}
--
Gitblit v1.9.1