|
|
@@ -786,14 +786,18 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
/**
|
|
|
* 添加微信提示和站内消息
|
|
|
* @param recipient 接受者
|
|
|
- * @param type 状态 0驳回 1发起 2同意
|
|
|
+ * @param type 状态 0驳回 1发起 2同意 3撤销
|
|
|
* @param str
|
|
|
*/
|
|
|
private Integer addWeChatNotice(Admin recipient,Integer type,String str,Integer prid){
|
|
|
AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
|
|
|
String openid=recipient.getOpenId();
|
|
|
str=new StringBuffer("[").append(my.getName()).append("]").append(str).toString();
|
|
|
- addpublicLog(prid,type,str);
|
|
|
+ if(type==3){
|
|
|
+ addpublicLog(prid,4,str);
|
|
|
+ }else {
|
|
|
+ addpublicLog(prid,type,str);
|
|
|
+ }
|
|
|
sendNoticeAndSoucket(recipient.getId(),type,str);
|
|
|
if (type==0||type==2){
|
|
|
if (openid!=null) {
|