|
|
@@ -80,14 +80,20 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
Date date =new Date();
|
|
|
in.setCreateTime(date);
|
|
|
in.setStatus(1);
|
|
|
- in.setAid(TokenManager.getAdminId());
|
|
|
+ String aid=TokenManager.getAdminId();
|
|
|
+ in.setAid(aid);
|
|
|
+ User u=userMapper.selectByPrimaryKey(in.getUid());
|
|
|
+ if (u.getAid().equals(aid)){
|
|
|
+ in.setMianStatus(1);
|
|
|
+ }else{
|
|
|
+ in.setMianStatus(0);
|
|
|
+ }
|
|
|
publicReleaseMapper.insertSelectiveGetId(in);
|
|
|
AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
|
|
|
Admin a=adminMapper.selectByPrimaryKey(my.getSuperiorId());
|
|
|
PublicReleaseLog log=new PublicReleaseLog(in.getId(),TokenManager.getAdminId(),1,"发起外出申请",new Date());
|
|
|
publicReleaseLogMapper.insertSelective(log);
|
|
|
String openid=a.getOpenId();
|
|
|
- User u=userMapper.selectByPrimaryKey(in.getUid());
|
|
|
String str="["+my.getName()+"]发起["+u.getNickname()+"]的外出申请,请及时审核。";
|
|
|
sendNoticeAndSoucket(a.getId(),NoticeStatus.PUBLIC_RELEASE_START.getCode(),str);
|
|
|
Map<String, Object>map=new HashMap<String, Object>();
|