diff options
| author | wangwenrui <[email protected]> | 2018-10-11 14:14:57 +0800 |
|---|---|---|
| committer | wangwenrui <[email protected]> | 2018-10-11 14:14:57 +0800 |
| commit | 31b50142dd79997cad2fd62a473332a43ae715c6 (patch) | |
| tree | 9824cf3c46529550b22d5ff87e8282d6cdbef788 /src | |
| parent | 95e45ef257edfd20c793e06a51f44aa9c4c2eda3 (diff) | |
输入框提示失效bug修改
Diffstat (limited to 'src')
| -rw-r--r-- | src/nis/nms/util/BaseAction.java | 12 | ||||
| -rw-r--r-- | src/nis/nms/web/actions/nmstaskManager/NmsTaskManagerAction.java | 3 |
2 files changed, 10 insertions, 5 deletions
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(
"<script type=\"text/javascript\">alert('i18n_NmsTaskManagerAction.executeAction.success_n81i');this.location='nmsTaskManager.do?action=query'</script>");
}
-
+ commonService.commit();
} catch (Exception e) {
commonService.rollback();
e.printStackTrace();
|