diff --git a/emis-biz-web/emis-biz-web.iml b/emis-biz-web/emis-biz-web.iml
index 67c57b627..332c57fd9 100644
--- a/emis-biz-web/emis-biz-web.iml
+++ b/emis-biz-web/emis-biz-web.iml
@@ -19,9 +19,16 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -31,80 +38,32 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
@@ -123,6 +82,7 @@
+
@@ -180,6 +140,9 @@
+
+
+
@@ -205,6 +168,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -243,6 +242,7 @@
+
diff --git a/emis-biz-web/pom.xml b/emis-biz-web/pom.xml
index 6e78e4828..cbeb5282f 100644
--- a/emis-biz-web/pom.xml
+++ b/emis-biz-web/pom.xml
@@ -24,13 +24,6 @@
-
-
- com.xdadan
- emis-framework
- 1.0.4
-
-
com.xdadan
emis-biz
diff --git a/emis-biz/emis-biz.iml b/emis-biz/emis-biz.iml
index b37872d66..9c01e055a 100644
--- a/emis-biz/emis-biz.iml
+++ b/emis-biz/emis-biz.iml
@@ -4,6 +4,11 @@
+
+
+
+
+
@@ -163,6 +168,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/emis-biz/pom.xml b/emis-biz/pom.xml
index fb03d5954..120a0b348 100644
--- a/emis-biz/pom.xml
+++ b/emis-biz/pom.xml
@@ -23,6 +23,13 @@
1.0.4
+
+
+ com.xdadan
+ emis-framework
+ 1.0.4
+
+
com.xdadan
emis-system
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 5b09604ae..0e4b01385 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -46,6 +46,7 @@ package com.xdadan.erp.emis.service;
import com.xdadan.erp.emis.utils.Q17trackHelper;
import com.xdadan.erp.emis.utils.WaybillHelper;
import com.xdadan.erp.emis.utils.sensitive.Convert;
+ import com.xdadan.erp.framework.manager.NoticManager;
import com.xdadan.erp.system.mapper.SysUserMapper;
import com.xdadan.erp.system.service.ISysConfigService;
import com.xdadan.erp.system.service.ISysNoticeService;
@@ -2341,7 +2342,7 @@ public class EmisBaseService {
/**
* 发送消息给用户
- * @param empCode,多个使用逗号隔开
+ * @param empCodeStr,多个使用逗号隔开
* @param title
* @param msg
* @param clickPath
@@ -2353,7 +2354,7 @@ public class EmisBaseService {
String empCode=empCodeArr[i];
SysUser empUser = getEmisStaffByCode(empCode);
if(empUser!=null) {
- sysNoticeService.addNoticeToUser(title, msg, clickPath, empUser.getUserId());
+ NoticManager.addNoticeToUser(title, msg, clickPath, empUser.getUserId());
}
}
}
@@ -2373,7 +2374,8 @@ public class EmisBaseService {
List sysUserList = userService.selectUserList(queryUser);
if(!CollectionUtils.isEmpty(sysUserList)) {
for (SysUser empUser:sysUserList) {
- sysNoticeService.addNoticeToUser(title, msg, clickPath, empUser.getUserId());
+ // 发送及时通知
+ NoticManager.addNoticeToUser(title, msg, clickPath, empUser.getUserId());
}
}
}
@@ -2393,7 +2395,7 @@ public class EmisBaseService {
List sysUserList = userService.selectUserList(queryUser);
if(!CollectionUtils.isEmpty(sysUserList)) {
for (SysUser empUser:sysUserList) {
- sysNoticeService.addNoticeToUser(title, msg, clickPath, empUser.getUserId());
+ NoticManager.addNoticeToUser(title, msg, clickPath, empUser.getUserId());
}
}
}