#

LSH

2023-11-28 3481efebb5033dd35ce6066d030873a892d1db76

 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;