diff --git a/src/nis/nms/util/BaseAction.java b/src/nis/nms/util/BaseAction.java index f099a37..009c42a 100644 --- a/src/nis/nms/util/BaseAction.java +++ b/src/nis/nms/util/BaseAction.java @@ -260,10 +260,11 @@ public abstract class BaseAction extends ActionSupport implements Serializable * @return */ public boolean getAdminMark(){ - if(StringUtils.isNotEmpty(rb.getString("common.admin.mark")) && getUser()!=null){ - if(rb.getString("common.admin.mark").equals(getUser().getYhbh()) + XtYhJbxx user =getUser1(); + if(StringUtils.isNotEmpty(rb.getString("common.admin.mark")) && user!=null){ + if(rb.getString("common.admin.mark").equals(getUser1().getYhbh()) || getSystemID().equals(-1L) - ||"admin".equalsIgnoreCase(getUser().getYhbh())){ + ||"admin".equalsIgnoreCase(getUser1().getYhbh())){ return true; }else return false; }else @@ -430,6 +431,11 @@ public abstract class BaseAction extends ActionSupport implements Serializable XtYhJbxx user = (XtYhJbxx)session.getAttribute(Constant.SESSION_CZY_NAME); return user; } + public XtYhJbxx getUser1(){ + HttpSession session = getRequest().getSession(true); + XtYhJbxx user = (XtYhJbxx)session.getAttribute(Constant.SESSION_CZY_NAME); + return user; + } public String getExp(List list,String name,String tem,List... lists) { InputStream in = null; OutputStream out = null; diff --git a/src/nis/nms/web/actions/nmstaskManager/NmsTaskManagerAction.java b/src/nis/nms/web/actions/nmstaskManager/NmsTaskManagerAction.java index 9607461..8c0b5d3 100644 --- a/src/nis/nms/web/actions/nmstaskManager/NmsTaskManagerAction.java +++ b/src/nis/nms/web/actions/nmstaskManager/NmsTaskManagerAction.java @@ -4702,7 +4702,6 @@ public class NmsTaskManagerAction extends BaseAction { missionstatetable.getMissionId()); // sendInfo(missionstatetable.getMissionId(),0l,new // File(fileName)); - commonService.commit(); logger.debug("开始发送任务信息,任务id:" + missionstatetable.getMissionId()); sendMissionInfoId(missionstatetable.getMissionId(), 0l, commonService); } @@ -4717,7 +4716,7 @@ public class NmsTaskManagerAction extends BaseAction { outHtmlString( ""); } - + commonService.commit(); } catch (Exception e) { commonService.rollback(); e.printStackTrace();