Browse Source

限定项目客户情况查询修改

anderx 1 year ago
parent
commit
e984202d35

+ 8 - 7
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -230,19 +230,20 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
                         if (!u.getAid().equals(my.getId())) {
 							List<RestrictProject> list = restrictProjectMapper.selectListByParam(new InputRestrictProject(u.getId(), my.getId()));
 							StringBuilder str2 = new StringBuilder();
+							Admin admin = adminMapper.selectByPrimaryKey(u.getAid());
 							if (!list.isEmpty()){
 								String start = DateUtils.formatDate(in.getReleaseStart(), AFTConstants.MMDDHHMM);
 								String end = DateUtils.formatDate(in.getReleaseEnd(), AFTConstants.MMDDHHMM);
 								str2.append("限定项目所属人营销员").append(my.getName()).append("于")
 										.append(start).append("至").append(end).append("公出你的企业[").append(u.getNickname()).append("]请悉知!");
-							}else {
-                                str2.append(my.getName()).append("(需审核),准备公出您的企业")
-                                        .append("[").append(u.getNickname()).append("]。");
-                                Admin admin = adminMapper.selectByPrimaryKey(u.getAid());
-								addPublicExamine(in.getId(), admin);
-								pushNoticeAndSoucketAndEmail(my, in, date, admin, str, map);
-								if (in.getPublicType() == null || in.getPublicType() == 0) in.setPublicType(1);
+								sendEmailAndNoticeAndSoucket(u.getAid(), 3, str2.toString());
 							}
+							str2.append(my.getName()).append("(需审核),准备公出您的企业")
+									.append("[").append(u.getNickname()).append("]。");
+							addPublicExamine(in.getId(), admin);
+							if (in.getPublicType() == null || in.getPublicType() == 0) in.setPublicType(1);
+							//审核通知
+							pushNoticeAndSoucketAndEmail(my, in, date, admin, str, map);
 							sendEmailAndNoticeAndSoucket(u.getAid(), 3, str2.toString());
 							status.set(0);
                         }