gfwleak/nms-nmsweb
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

输入框提示失效bug修改

Browse Source
This commit is contained in:
wangwenrui
2018-10-11 14:14:57 +08:00
parent 95e45ef257
commit 31b50142dd
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/nis/nms/util/BaseAction.java
View File

@@ -260,10 +260,11 @@ public abstract class BaseAction extends ActionSupport implements Serializable
* @return * @return
*/ */
public boolean getAdminMark(){ public boolean getAdminMark(){
if(StringUtils.isNotEmpty(rb.getString("common.admin.mark")) && getUser()!=null){ XtYhJbxx user =getUser1();
if(rb.getString("common.admin.mark").equals(getUser().getYhbh()) if(StringUtils.isNotEmpty(rb.getString("common.admin.mark")) && user!=null){
if(rb.getString("common.admin.mark").equals(getUser1().getYhbh())
|| getSystemID().equals(-1L) || getSystemID().equals(-1L)
||"admin".equalsIgnoreCase(getUser().getYhbh())){ ||"admin".equalsIgnoreCase(getUser1().getYhbh())){
return true; return true;
}else return false; }else return false;
}else }else
@@ -430,6 +431,11 @@ public abstract class BaseAction extends ActionSupport implements Serializable
XtYhJbxx user = (XtYhJbxx)session.getAttribute(Constant.SESSION_CZY_NAME); XtYhJbxx user = (XtYhJbxx)session.getAttribute(Constant.SESSION_CZY_NAME);
return user; 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) { public String getExp(List list,String name,String tem,List... lists) {
InputStream in = null; InputStream in = null;
OutputStream out = null; OutputStream out = null;

3
src/nis/nms/web/actions/nmstaskManager/NmsTaskManagerAction.java
View File

@@ -4702,7 +4702,6 @@ public class NmsTaskManagerAction extends BaseAction {
missionstatetable.getMissionId()); missionstatetable.getMissionId());
// sendInfo(missionstatetable.getMissionId(),0l,new // sendInfo(missionstatetable.getMissionId(),0l,new
// File(fileName)); // File(fileName));
commonService.commit();
logger.debug("开始发送任务信息，任务id：" + missionstatetable.getMissionId()); logger.debug("开始发送任务信息，任务id：" + missionstatetable.getMissionId());
sendMissionInfoId(missionstatetable.getMissionId(), 0l, commonService); sendMissionInfoId(missionstatetable.getMissionId(), 0l, commonService);
} }
@@ -4717,7 +4716,7 @@ public class NmsTaskManagerAction extends BaseAction {
outHtmlString( outHtmlString(
"<script type=\"text/javascript\">alert('i18n_NmsTaskManagerAction.executeAction.success_n81i');this.location='nmsTaskManager.do?action=query'</script>"); "<script type=\"text/javascript\">alert('i18n_NmsTaskManagerAction.executeAction.success_n81i');this.location='nmsTaskManager.do?action=query'</script>");
} }
commonService.commit();
} catch (Exception e) { } catch (Exception e) {
commonService.rollback(); commonService.rollback();
e.printStackTrace(); e.printStackTrace();