#

LSH

2023-12-01 7804e0f43c902645e29a5a7fccd2c741f86cd312

 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("审批成功但短信发送失败!");
            }
        }