|
@@ -97,7 +97,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
String str="["+my.getName()+"]发起["+u.getNickname()+"]的外出申请,请及时审核。";
|
|
String str="["+my.getName()+"]发起["+u.getNickname()+"]的外出申请,请及时审核。";
|
|
|
sendNoticeAndSoucket(a.getId(),NoticeStatus.PUBLIC_RELEASE_START.getCode(),str);
|
|
sendNoticeAndSoucket(a.getId(),NoticeStatus.PUBLIC_RELEASE_START.getCode(),str);
|
|
|
Map<String, Object>map=new HashMap<String, Object>();
|
|
Map<String, Object>map=new HashMap<String, Object>();
|
|
|
- map.put("id", in.getId());
|
|
|
|
|
|
|
+ map.put("data", publicReleaseMapper.selectDtails(in.getId(),null));
|
|
|
if (openid!=null) {
|
|
if (openid!=null) {
|
|
|
Integer res= weChatUtils.addNotice(openid, in.getStatus(),in.getId(),date,my.getName(),"["+my.getName()+"]发起外出申请");
|
|
Integer res= weChatUtils.addNotice(openid, in.getStatus(),in.getId(),date,my.getName(),"["+my.getName()+"]发起外出申请");
|
|
|
if (res!=0) {
|
|
if (res!=0) {
|
|
@@ -284,10 +284,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
//如果不是本人和审核人员则不返回信息
|
|
//如果不是本人和审核人员则不返回信息
|
|
|
if(out!=null&&!TokenManager.getAdminId().equals( out.getAid())&&!TokenManager.getAdminId().equals(out.getSuprId())) {
|
|
if(out!=null&&!TokenManager.getAdminId().equals( out.getAid())&&!TokenManager.getAdminId().equals(out.getSuprId())) {
|
|
|
out=null;
|
|
out=null;
|
|
|
- }else if(TokenManager.getAdminId().equals(out.getSuprId())) {
|
|
|
|
|
- out.setPermission(1);
|
|
|
|
|
- }else {
|
|
|
|
|
|
|
+ }else if(TokenManager.getAdminId().equals(out.getAid())) {
|
|
|
out.setPermission(0);
|
|
out.setPermission(0);
|
|
|
|
|
+ }else {
|
|
|
|
|
+ out.setPermission(1);
|
|
|
}
|
|
}
|
|
|
return out;
|
|
return out;
|
|
|
}
|
|
}
|