Merge branch 'lal' into develop

src/main/java/cn/timer/api/controller/htzz/HtzzController.java

@@ -82,14 +82,15 @@ public class HtzzController {
 			return ResultUtil.error("短信套餐已到期！");
 			return ResultUtil.error("短信套餐已到期！");
 		}
 		}
 
 
-		zzda.setTxkgType(1);
+		zzda.setTxkgType(1);//
 		zzda.setLrrid(userBean.getEmpNum());
 		zzda.setLrrid(userBean.getEmpNum());
 		zzda.setLrsjTime(new Date());
 		zzda.setLrsjTime(new Date());
 		zzda.setOrgCode(orgCode);
 		zzda.setOrgCode(orgCode);
 		
 		
 		zzda.setSendingStatus(0);//0：未发；1：已发
 		zzda.setSendingStatus(0);//0：未发；1：已发
 		zzda.setTemplateId(zzda.getTemplateId());//消息模板id
 		zzda.setTemplateId(zzda.getTemplateId());//消息模板id
-		zzda.insert();
+//		zzda.insert();
+		zzda.insertOrUpdate();
 
 
 		/**
 		/**
 		 * 新增通知关系表，每人一个
 		 * 新增通知关系表，每人一个
@@ -98,6 +99,10 @@ public class HtzzController {
 		List<NotifyPersonDto> ids = zzda.getIds();//通知人    用户id+手机号码
 		List<NotifyPersonDto> ids = zzda.getIds();//通知人    用户id+手机号码
 		List<HtzzAssoHtgx> htgxs = new ArrayList<HtzzAssoHtgx>(ids.size());
 		List<HtzzAssoHtgx> htgxs = new ArrayList<HtzzAssoHtgx>(ids.size());
 		for (NotifyPersonDto pre : ids) {
 		for (NotifyPersonDto pre : ids) {
+			
+			HtzzAssoHtgx.builder().build().delete(new QueryWrapper<HtzzAssoHtgx>().lambda().eq(HtzzAssoHtgx::getOrgCode, orgCode).eq(HtzzAssoHtgx::getTzrid, pre.getUserids())
+					.eq(HtzzAssoHtgx::getPhone, pre.getPhone()));
+			
 			QueryWrapper<YgglMainEmp> queryWrapper = new QueryWrapper<>();
 			QueryWrapper<YgglMainEmp> queryWrapper = new QueryWrapper<>();
 			queryWrapper.select("name", "phone", "emp_num").eq("emp_num", pre.getUserids()).eq("org_code", orgCode);
 			queryWrapper.select("name", "phone", "emp_num").eq("emp_num", pre.getUserids()).eq("org_code", orgCode);
 			emp = YgglMainEmp.builder().build().selectOne(queryWrapper);
 			emp = YgglMainEmp.builder().build().selectOne(queryWrapper);