diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java index c369ad0f..ba9a7a61 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java @@ -2,6 +2,7 @@ package com.bonus.sgzb.app.controller; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.PhoneUtil; import com.bonus.sgzb.app.domain.*; import com.bonus.sgzb.app.service.LeaseApplyDetailsService; import com.bonus.sgzb.app.service.LeaseApplyInfoService; @@ -171,6 +172,13 @@ public class TmTaskController extends BaseController { if (StringUtils.isNull(task)) { return AjaxResult.error("参数错误"); } + if (StringUtils.isNotNull(task.getLeaseApplyInfo().getPhone())) { + String phone = task.getLeaseApplyInfo().getPhone(); + if (!PhoneUtil.isMobile(phone)){ + logger.error("手机号格式错误 :{}", phone); + return AjaxResult.error("手机号格式错误"); + } + } try { String code = tmTaskService.genderLeaseCode(); if (StringUtils.isEmpty(code)) { diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml index 97eb7bef..521a7470 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml @@ -662,6 +662,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bpl.lot_id as lotId, bpl.lot_name as lotName, bui.unit_id as unitId, + bai.remark as remark, bui.unit_name as unitName, bai.back_time as backTime, bagi.agreement_code as agreementCode, @@ -788,6 +789,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bai.phone, bai.task_id as taskId, bpl.lot_id as lotId, + bai.remark as remark, bpl.lot_name as lotName, bui.unit_id as unitId, bui.unit_name as unitName,