From 48c0c556e314052229692508d3d24285343b7961 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 29 十一月 2023 15:00:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/PriQuoteController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java b/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
index 04612bb..ce8f0a9 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
@@ -94,6 +94,8 @@
convert(param, wrapper);
allLike(PriQuote.class, param.keySet(), wrapper, condition);
wrapper.or().eq("member_id",getUserId());
+ wrapper.orderBy("update_time",false);
+ wrapper.orderBy("create_time",false);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(priQuoteService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -512,7 +514,7 @@
if (!priQuoteService.updateById(priQuote)) {
throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
- if (!smsCodeService.sendSmsCodeText(planLeader.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E)) {
+ if (!smsCodeService.sendSmsCodeText(planLeader.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E,getUserId())) {
return R.ok("瀹℃壒鎴愬姛浣嗙煭淇″彂閫佸け璐�!");
}
@@ -561,7 +563,7 @@
throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
User phoneUser = userService.selectById(priQuote.getUserId());
- if (!smsCodeService.sendSmsCodeText(phoneUser.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E)) {
+ if (!smsCodeService.sendSmsCodeText(phoneUser.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E,getUserId())) {
return R.ok("瀹℃壒鎴愬姛浣嗙煭淇″彂閫佸け璐�!");
}
break;
--
Gitblit v1.9.1