Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/managementcenter/project/util/PickingInfo.java

@@ -19,7 +19,7 @@ import javax.servlet.ServletContext;
 import java.util.*;
 
 public  class PickingInfo {
-    public final static String[] ALL_USER_ID={"项目经理","配网工程专职","配网政策处理专职","配网物资专职","项目管理中心领导","配网系统专职","配网运行人员","经研所","施工单位A","施工单位B","设计单位A","设计单位B"};
+    public final static String[] ALL_USER_ID={"项目经理","配网工程专职","配网政策处理专职","配网物资专职","项目管理中心领导","配网系统专职","配网运行人员（前期）","配网运行人员（后期）","经研所","振农公司","工程公司","配电工区","电力设计院"};
     public final static String[] QH_USER_ID={"配网物资专职","项目管理中心领导"};
     public final static String[] CS_XMJL = {"项目经理"};
     public static List<String> getListUserId(String[] userName){

src/main/webapp/webpage/modules/oa/notify/oaNotifyFormMaterial.jsp

@@ -11,7 +11,7 @@
 			jp.ajaxForm("#inputForm",function(data){
 				if(data.success){
 					jp.success(data.msg);
-					jp.go("${ctx}/oa/oaNotify");
+					<%--jp.go("${ctx}/oa/oaNotify");--%>
 				}else{
 					jp.error(data.msg);
 				}