列表点开可展示接收短信手机号码，列表手机号码来源，可输入新增、可从用户库里选择，选择支持单选、多选、全选，列表手机号可增减

crmeb-admin/src/main/java/com/zbkj/admin/controller/merchant/NewMerchantApi.java

@@ -8,6 +8,7 @@ import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.zbkj.admin.controller.newapi.request.ProductAttrValueIntegralRequest;
+import com.zbkj.admin.controller.newapi.request.UserEnterpriseSearchRequest;
 import com.zbkj.admin.service.AAAService;
 import com.zbkj.admin.service.FinanceService;
 import com.zbkj.admin.task.sms.DynamicScheduledTask;
@@ -446,7 +447,7 @@ public class NewMerchantApi {
 //        return CommonResult.failed();
 //    }
 
-    @ApiOperation(value = "获取手机号根据登录merId")
+    @ApiOperation(value = "获取未发送手机号根据登录merId")
     @RequestMapping(value = "/getPhoneList", method = RequestMethod.GET)
     public CommonResult<CommonPage<User>> getPhoneList(@RequestParam(value = "isMessage") String isMessage,
                                                        @ModelAttribute PageParamRequest pageParamRequest) {
@@ -458,15 +459,30 @@ public class NewMerchantApi {
         return CommonResult.success(userCommonPage);
     }
 
+    @ApiOperation(value = "获取已经发送手机号根据登录merId")
+    @RequestMapping(value = "/getPhoneNoList", method = RequestMethod.POST)
+    public CommonResult<?> getPhoneNoList(@ModelAttribute @Validated User request,
+                                          @Validated PageParamRequest pageParamRequest) {
+        SystemAdmin systemAdmin = SecurityUtil.getLoginUserVo().getUser();
+        LambdaQueryWrapper<TaskMessage> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TaskMessage::getMerId,systemAdmin.getMerId());
+        queryWrapper.eq(TaskMessage::getIsMessage,"1");
+        Page<TaskMessage> page = PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
+        List<TaskMessage> list = taskMessageService.list(queryWrapper);
+        return CommonResult.success(CommonPage.restPage(CommonPage.copyPageInfo(page, list)));
+
+    }
+
     @ApiOperation(value = "发送短信手机号保存")
     @RequestMapping(value = "/savePhone", method = RequestMethod.POST)
     public CommonResult<?> savePhone(@RequestBody List<User> user) {
         SystemAdmin systemAdmin = SecurityUtil.getLoginUserVo().getUser();
-
         userService.savePhone(user, systemAdmin);
         return CommonResult.success("操作成功");
 
     }
 
 
+
+
 }

crmeb-service/src/main/resources/mapper/system/TaskMessageMapper.xml

@@ -3,6 +3,6 @@
 <mapper namespace="com.zbkj.service.dao.TaskMessageDao">
 
 <select id="getMerByMerId" parameterType="java.lang.Integer" resultType="com.zbkj.common.model.system.TaskMessage">
-    select * from eb_task_message where mer_id =#{merId}
+    select * from eb_task_message where is_message='0'vand  mer_id =#{merId}
     </select>
 </mapper>