Merge remote-tracking branch 'origin/develop' into develop

WebContent/WEB-INF/web.xml

@@ -68,13 +68,16 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j
 	   <filter-name>CASFilter</filter-name>    
 	   <filter-class>org.jasig.cas.client.authentication.AuthenticationFilter</filter-class>    
 	   <init-param>    
-	      <param-name>casServerLoginUrl</param-name>    
-	      <param-value>http://cas.jfbrother.com/cas-jfsso/login</param-value><!-- cas 服务器登录 地址  http://IP:PORT/CasWebProName/login -->    
+	      <!-- <param-name>casServerLoginUrl</param-name>    
+	      <param-value>http://localhost:8080/cas-jfsso/login</param-value> --><!-- cas 服务器登录 地址  http://IP:PORT/CasWebProName/login -->    
+	      <param-name>casServerLoginUrl</param-name>
+	      <param-value>http://cas.jfbrother.com/cas-jfsso/login</param-value><!-- cas 服务器登录 地址  http://IP:PORT/CasWebProName/login -->   
 	   </init-param>    
 	   <init-param>    
 	      <!-- 这里的server是服务端的IP -->    
 	      <param-name>serverName</param-name>    
-	      <param-value>http://localhost:8080</param-value><!-- 客户端服务器地址   http://IP:PORT -->    
+	      <!-- <param-value>http://portal.jfbrother.com:9003</param-value>客户端服务器地址   http://IP:PORT --> 
+	      <param-value>localhost:8080</param-value>
 	   </init-param>    
 	   </filter> 
 	   <filter-mapping>    
@@ -89,11 +92,13 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j
         <filter-class>org.jasig.cas.client.validation.Cas20ProxyReceivingTicketValidationFilter</filter-class>    
         <init-param>    
            <param-name>casServerUrlPrefix</param-name>    
-           <param-value>http://cas.jfbrother.com/cas-jfsso</param-value><!-- cas 服务器地址  http://IP:PORT/CasWebProName -->    
+           <!-- <param-value>http://localhost:8080/cas-jfsso</param-value> --><!-- cas 服务器地址  http://IP:PORT/CasWebProName -->
+	       <param-value>http://cas.jfbrother.com/cas-jfsso</param-value>    
         </init-param>    
         <init-param>    
            <param-name>serverName</param-name>    
-           <param-value>http://localhost:8080</param-value><!-- 客户端服务器地址   http://IP:PORT -->    
+           <!-- <param-value>http://portal.jfbrother.com:9003</param-value>客户端服务器地址   http://IP:PORT -->
+           <param-value>localhost:8080</param-value>
         </init-param>    
       </filter>    
       <filter-mapping>    

WebContent/custom/js/jquery.extend.js

@@ -114,7 +114,7 @@ $.extend({
 		        return -1;//不是ie浏览器
 		    }
 		},
-		//获得浏览器的宽度
+		//获得浏览器滚动条的宽度
 		getScrollbarWidth:function(){
 		    var oP = document.createElement('p'), styles = {
 		        width: '100px',
@@ -215,6 +215,153 @@ $.extend({
 			var date2=new Date(end_list[0],end_list[1],end_list[2]);
 			var date=(date2.getTime()-date1.getTime())/(1000*60*60*24);/*不用考虑闰年否*/
 			return date;
+		 },
+		 /**树的搜索功能
+		  * @param zTreeId ztree对象的id,不需要#
+		  * @param searchField 输入框选择器
+		  * @param isHighLight 是否高亮,默认高亮,传入false禁用
+		  * @param isExpand 是否展开,默认合拢,传入true展开
+		  * @param searchBtn 绑定要点击的那个按钮的选择器
+		  */
+		 fuzzySearch:function(zTreeId, searchField, isHighLight, isExpand,searchBtn){
+			var zTreeObj = $.fn.zTree.getZTreeObj(zTreeId);//get the ztree object by ztree id
+			if(!zTreeObj){
+				alter("fail to get ztree object");
+			}
+			var nameKey = zTreeObj.setting.data.key.name; //get the key of the node name
+			isHighLight = isHighLight===false?false:true;//default true, only use false to disable highlight
+			isExpand = isExpand?true:false; // not to expand in default
+			zTreeObj.setting.view.nameIsHTML = isHighLight; //allow use html in node name for highlight use
+			
+			var metaChar = '[\\[\\]\\\\\^\\$\\.\\|\\?\\*\\+\\(\\)]'; //js meta characters
+			var rexMeta = new RegExp(metaChar, 'gi');//regular expression to match meta characters
+			
+			// keywords filter function 
+			function ztreeFilter(zTreeObj,_keywords,callBackFunc) {
+				if(!_keywords){
+					_keywords =''; //default blank for _keywords 
+				}
+				
+				// function to find the matching node
+				function filterFunc(node) {
+					if(node && node.oldname && node.oldname.length>0){
+						node[nameKey] = node.oldname; //recover oldname of the node if exist
+					}
+					zTreeObj.updateNode(node); //update node to for modifications take effect
+					if (_keywords.length == 0) {
+						//return true to show all nodes if the keyword is blank
+						zTreeObj.showNode(node);
+						//zTreeObj.expandNode(node,isExpand);
+						//如果没有输入值时,则显示所有的目录,并且折叠
+						zTreeObj.expandNode(node,false);
+						return true;
+					}
+					//transform node name and keywords to lowercase
+					if (node[nameKey] && node[nameKey].toLowerCase().indexOf(_keywords.toLowerCase())!=-1) {
+						if(isHighLight){ //highlight process
+							//a new variable 'newKeywords' created to store the keywords information 
+							//keep the parameter '_keywords' as initial and it will be used in next node
+							//process the meta characters in _keywords thus the RegExp can be correctly used in str.replace
+							var newKeywords = _keywords.replace(rexMeta,function(matchStr){
+								//add escape character before meta characters
+								return '\\' + matchStr;
+							});
+							node.oldname = node[nameKey]; //store the old name  
+							var rexGlobal = new RegExp(newKeywords, 'gi');//'g' for global,'i' for ignore case
+							//use replace(RegExp,replacement) since replace(/substr/g,replacement) cannot be used here
+							node[nameKey] = node.oldname.replace(rexGlobal, function(originalText){
+								//highlight the matching words in node name
+								var highLightText =
+									'<span style="margin-left:0;color: whitesmoke;background-color: darkred;">'
+									+ originalText
+									+'</span>';
+								return 	highLightText;					
+							});
+							zTreeObj.updateNode(node); //update node for modifications take effect
+						}
+						zTreeObj.showNode(node);//show node with matching keywords
+						return true; //return true and show this node
+					}
+					
+					zTreeObj.hideNode(node); // hide node that not matched
+					return false; //return false for node not matched
+				}
+				
+				var nodesShow = zTreeObj.getNodesByFilter(filterFunc); //get all nodes that would be shown
+				processShowNodes(nodesShow, _keywords);//nodes should be reprocessed to show correctly
+			}
+			
+			/**
+			 * reprocess of nodes before showing
+			 */
+			function processShowNodes(nodesShow,_keywords){
+				if(nodesShow && nodesShow.length>0){
+					//process the ancient nodes if _keywords is not blank
+					if(_keywords.length>0){ 
+						$.each(nodesShow, function(n,obj){
+							var pathOfOne = obj.getPath();//get all the ancient nodes including current node
+							if(pathOfOne && pathOfOne.length>0){ 
+								//i < pathOfOne.length-1 process every node in path except self
+								for(var i=0;i<pathOfOne.length-1;i++){
+									zTreeObj.showNode(pathOfOne[i]); //show node 
+									zTreeObj.expandNode(pathOfOne[i],true); //expand node
+								}
+							}
+						});	
+					}else{ //show all nodes when _keywords is blank and expand the root nodes
+						var rootNodes = zTreeObj.getNodesByParam('level','0');//get all root nodes
+						$.each(rootNodes,function(n,obj){
+							zTreeObj.expandNode(obj,true); //expand all root nodes
+						});
+					}
+				}
+			}
+			
+			//listen to change in input element
+			/*$(searchField).bind('input propertychange', function() {
+				var _keywords = $(this).val();
+				searchNodeLazy(_keywords); //call lazy load
+			});
+
+			var timeoutId = null;
+			// excute lazy load once after input change, the last pending task will be cancled  
+			function searchNodeLazy(_keywords) {
+				if (timeoutId) { 
+					//clear pending task
+					clearTimeout(timeoutId);
+				}
+				timeoutId = setTimeout(function() {
+					ztreeFilter(zTreeObj,_keywords); //lazy load ztreeFilter function 
+					$(searchField).focus();//focus input field again after filtering
+				}, 500);
+			}*/
+			
+			//绑定要点击的那个按钮
+			$(searchBtn).bind('click',function(){
+				var _keywords = $(searchField).val();
+				ztreeFilter(zTreeObj,_keywords);
+			})
+			//输入框的回车键操作
+			$(searchField).bind("keydown",function(e){
+			　　// 兼容FF和IE和Opera
+			　　var theEvent = e || window.event;
+			　　var code = theEvent.keyCode || theEvent.which || theEvent.charCode;
+			　　 if (code == 13) {
+					//回车执行查询
+					var _keywords = $(searchField).val();
+					ztreeFilter(zTreeObj,_keywords);
+			　　}
+			});
+		 },
+		 /**去掉Html标签代码
+		  *  @param str 带有Html的字符串
+		  */
+		 removeHtml:function(str){
+			str = str || "";//防止空指针
+			str = str.replace(/<(?!\/?p\b)[^>]+>|(<p)\b[^>]*(>)/ig, "$1$2");
+			str = str.replace(/\s+/g,"");
+			str = str.replace(new RegExp("&nbsp;","gm"),"");
+			return str;
 		 }
 		 //
 	}

WebContent/jfcas04/css/common.css

@@ -1177,7 +1177,7 @@ a{
     line-height: 28px;
     padding-left:6px;
     color:#bbb;
-    width:70%;
+    width:85%;
 }
 .disk_move_search>span{
 	border:1px solid #f2f2f2;
@@ -1185,8 +1185,8 @@ a{
     line-height: 28px;
   	color:#333;
   	display: inline-block;
-  	width:25%;
-  	margin-left:5%;
+  	width:13%;
+  	margin-left:2%;
   	vertical-align: bottom;
   	text-align:center;
   	cursor: pointer;  
@@ -1229,7 +1229,7 @@ a{
     margin-left: 10px;
 }
 .disk_move_tree li span.button.ico_close,.disk_move_tree li span.button.ico_open,.disk_move_tree li span.button.ico_docu{
-	background-size: cover !important;
+	background-size: 100% 100% !important;
     width: 23px !important;
     height: 17px !important;
     vertical-align: text-bottom !important;
@@ -1247,6 +1247,9 @@ a{
 	padding-top:0px !important;
 	padding-left:4px !important;
 	border-radius: 3px;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
 }
 .ztree li span.button.noline_close{
 	background-image: url(../../custom/images/disk_move_tree_expand_gray.png) !important;
@@ -1511,6 +1514,106 @@ a{
 .disk_createShare_content>div>div{
 	padding:0px;
 }
+/***************选择人员的样式*********************/
+.disk_selectUser_content{
+	padding:0;
+}
+.disk_selectUser_content>div{
+	padding:0;
+	height:600px;
+}
+.disk_selectUser_content>div:first-child{
+	border-right:1px solid #e5e5e5;
+	overflow: auto;
+}
+.disk_selectUser_content>div:first-child>div:first-child>img{
+	margin-top:200px;
+	width:100%;
+}
+.disk_selectUser_table_title+div{
+	text-align: center;
+}
+.disk_selectUser_table_title+div>img{
+    width: 34%;
+    margin-top: 147px;
+}
+.disk_selectUser_table_title{
+	height:50px;
+	background: #f9f9f9;
+	padding-left:15px;
+    padding-top:10px;
+    border-bottom:1px solid #e5e5e5;
+}
+.disk_selectUser_table_title>input{
+	height:30px;
+	width:200px;
+	display: inline;
+	padding-left:7px;
+}
+.disk_selectUser_table_title>span{
+    margin-left: 15px;
+    background: #50B6FF;
+    padding: 0px 14px;
+    height: 30px;
+    line-height: 30px;
+    vertical-align: top;
+    display: inline-block;
+    color: white;
+    border-radius: 4px;
+    cursor: pointer;
+}
+.disk_selectUser_table_title>span:hover{
+	background: #93D5FF;
+}
+.disk_selectUser_table_title>label{
+	color:red;
+	margin-left:15px;
+	display: none;
+}
+/*******************选择人员的表格***************/
+.disk_selectUser_table{
+	padding:10px;
+}
+.disk_selectUser_table .fixed-table-body{
+	height: 411px;
+}
+.disk_selectUser_table table{
+	font-size:14px;
+}
+.disk_selectUser_table .pagination>.active>a,
+.disk_selectUser_table .pagination>.active>a:focus,
+.disk_selectUser_table .pagination>.active>a:hover, 
+.disk_selectUser_table .pagination>.active>span, 
+.disk_selectUser_table .pagination>.active>span:focus, 
+.disk_selectUser_table .pagination>.active>span:hover{
+	background: #50B6FF;
+	border-color: #50B6FF;
+	color:white;
+}
+.disk_selectUser_table .pagination>li>a:focus, 
+.disk_selectUser_table .pagination>li>a:hover, 
+.disk_selectUser_table .pagination>li>span:focus, 
+.disk_selectUser_table .pagination>li>span:hover,
+.disk_selectUser_table .pagination>li>a, 
+.disk_selectUser_table .pagination>li>span{
+	color:#666
+}
+.disk_selectUser_table .btn-default:hover,
+.disk_selectUser_table .btn-default.active,
+.disk_selectUser_table .btn-default:active,
+.disk_selectUser_table .open>.dropdown-toggle.btn-default{
+    background-color: #eee;
+    border-color: #ddd;
+}
+.disk_selectUser_table .dropdown-menu>.active>a,
+.disk_selectUser_table .dropdown-menu>.active>a:focus, 
+.disk_selectUser_table .dropdown-menu>.active>a:hover{
+	background-color:#50B6FF;
+}
+.disk_selectUser_table .fixed-table-container input[type="radio"],
+.disk_selectUser_table .fixed-table-container input[type="checkbox"]{
+	margin: 3px auto !important;
+}
 /*******************分享的样式*******************/
 .share_cotainer{
 	width:400px;

WebContent/jfcas04/disk.jsp

@@ -9,7 +9,7 @@
 <script type="text/javascript" src="${pageContext.request.contextPath}/jwapp/pages/storepersonal/js/storePersonalModule.js" charset="utf-8"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath}/jwapp/pages/store/js/storeModule.js" charset="utf-8"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath}/jwapp/pages/storeshare/js/storeShareModule.js" charset="utf-8"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath}/jwapp/pages/user/js/jwAppUserModule.js" charset="utf-8"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath}/jwapp/pages/userchoice/js/userchoiceModule.js" charset="utf-8"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath}/jwapp/pages/storepartook/js/storePartookModule.js" charset="utf-8"></script>
 <script src="${ctx}/jfcas04/js/disk.js"></script>
 </head>
@@ -21,14 +21,14 @@
 <div class="disk_container container-fluid">
 	<div class="row disk_search">
 		<div class="col-md-2">
-				<div class="col-md-6" onclick="location.href='disk'"><img src="${ctx}/custom/images/disk_home.png" wdith="14" height="14" /><span>|</span></div>
+				<div class="col-md-6" onclick="disk_back_home()"><img src="${ctx}/custom/images/disk_home.png" wdith="14" height="14" /><span>|</span></div>
 				<%-- <div class="col-md-3" id="disk_backFolder_prev" onclick="disk_backFolder_prev(this)"><img src="${ctx}/custom/images/disk_last.png" wdith="14" height="14" /><span>|</span></div>
 				<div class="col-md-3" id="disk_backFolder_next" onclick="disk_backFolder_next(this)"><img src="${ctx}/custom/images/disk_next.png" wdith="14" height="14" /><span>|</span></div> --%>
 				<div id="disk_rubbish" class="col-md-6" onclick="disk_rubbish()"><img src="${ctx}/custom/images/disk_circle.png" wdith="14" height="14" /></div>
 		</div>
 		<div class="col-md-7">
 			<div class="disk_search_center">
-				<a href="disk"><span class="glyphicon glyphicon-folder-close"></span><span>我的网盘</span><span class="glyphicon glyphicon-triangle-right"></span></a>
+				<a href="javascript:disk_back_home()"><span class="glyphicon glyphicon-folder-close"></span><span>我的网盘</span><span class="glyphicon glyphicon-triangle-right"></span></a>
 				<!-- <a onclick="disk_backFolder(this)"><span class="glyphicon glyphicon-folder-close"></span><span>我的网盘</span><span class="glyphicon glyphicon-triangle-right"></span></a> -->
 			</div>
 		</div>
@@ -44,7 +44,7 @@
 		<div class="col-md-12 disk_content_header">
 			<div class="col-md-11">
 				<a href="javascript:disk_uploadFolder()"><img src="${ctx}/custom/images/disk_upload.png" width="16" height="16" /><span>上传文件</span></a>
-				<a class="disk_document_default" href="javascript:disk_enjoyFolder()"><img src="${ctx}/custom/images/disk_gongxiang.png" width="16" height="16" /><span>共享文件</span></a>
+				<a class="disk_document_default" href="javascript:disk_enjoyFolder()"><img src="${ctx}/custom/images/disk_gongxiang.png" width="16" height="16" /><span>共享</span></a>
 				<a href="javascript:disk_addFolder()"><img src="${ctx}/custom/images/disk_add.png" width="16" height="16" /><span>新建文件夹</span></a>
 				<a class="disk_document_default" href="javascript:disk_deleteFolder()"><img src="${ctx}/custom/images/disk_delete.png" width="16" height="16" /><span>删除</span></a>
 				<a class="disk_document_default" href="javascript:disk_shareFolder()"><img src="${ctx}/custom/images/disk_share.png" width="16" height="16" /><span>分享</span></a>
@@ -59,85 +59,8 @@
 			<div class="col-md-1"><span onclick="disk_content_toggle(this)" class="disk_content_toggleBtn glyphicon glyphicon-th-large" title="切换到列表模式"></span></div>
 		</div>
 		<!-- 缩略图 -->
-		<div class="col-md-12 disk_content_lump">
-			<%-- <div class="col-md-2">
-				<div>
-					<img src="${ctx}/custom/images/disk_module1.png"/>
-					<div>公司文件</div>
-					<input style="display:none;" type="text" class="form-control" value="公司文件"/>
-				</div>
-			</div>
-			<div class="col-md-2">
-				<div>
-					<img src="${ctx}/custom/images/disk_module2.png"/>
-					<div>共享文件</div>
-					<input style="display:none;" type="text" class="form-control" value="共享文件"/>
-				</div>
-			</div>
-			<div class="col-md-2">
-				<div>
-					<img src="${ctx}/custom/images/disk_module3.png"/>
-					<div>我的文件</div>
-					<input style="display:none;" type="text" class="form-control" value="我的文件"/>
-				</div>
-			</div>
-			<div class="col-md-2">
-				<div>
-					<img src="${ctx}/custom/images/disk_module4.png"/>
-					<div>我的共享</div>
-					<input style="display:none;" type="text" class="form-control" value="我的共享"/>
-				</div>
-			</div>
-			<div class="col-md-2">
-				<div>
-					<img src="${ctx}/custom/images/disk_rar.png"/>
-					<div>压缩文件夹</div>
-					<input style="display:none;" type="text" class="form-control" value="压缩文件夹"/>
-				</div>
-			</div>
-			<div class="col-md-2">
-				<div>
-					<img src="${ctx}/custom/images/disk_word.png"/>
-					<div>我的文档</div>
-					<input style="display:none;" type="text" class="form-control" value="我的文档"/>
-				</div>
-			</div>
-			<div class="col-md-2">
-				<div>
-					<img src="${ctx}/custom/images/disk_excel.png"/>
-					<div>我的EXCEL</div>
-					<input style="display:none;" type="text" class="form-control" value="我的EXCEL"/>
-				</div>
-			</div>
-			<div class="col-md-2">
-				<div>
-					<img src="${ctx}/custom/images/disk_ppt.png"/>
-					<div>我的PPT</div>
-					<input style="display:none;" style="display:none;" type="text" class="form-control" value="我的PPT"/>
-				</div>
-			</div>
-			<div class="col-md-2">
-				<div>
-					<img src="${ctx}/custom/images/disk_pdf.png"/>
-					<div>我的PDF</div>
-					<input style="display:none;" type="text" class="form-control" value="我的PDF"/>
-				</div>
-			</div>
-			<div class="col-md-2">
-				<div>
-					<img src="${ctx}/custom/images/disk_uploadImg.png"/>
-					<div>超级狙击手.png</div>
-					<input style="display:none;" type="text" class="form-control" value="超级狙击手.png"/>
-				</div>
-			</div>
-			<div class="col-md-2">
-				<div>
-					<img src="${ctx}/custom/images/disk_unknow.png"/>
-					<div>disk_unknow.bsl</div>
-					<input style="display:none;" type="text" class="form-control" value="disk_unknow.bsl"/>
-				</div>
-			</div> --%>
-		</div>
+		<div class="col-md-12 disk_content_lump"></div>
+		
 		<!-- 列表 -->
 		<div class="disk_content_list disk_table disk_table_height" style="display:none;margin-bottom:20px;" >
 			<table id="disk_content_list"></table>

WebContent/jfcas04/js/index.js

@@ -1514,7 +1514,7 @@ function init_index_color(color) {
 
 		palette : [
 			[ "rgb(0, 0, 0)", "rgb(67, 67, 67)", "rgb(102, 102, 102)", /*"rgb(153, 153, 153)","rgb(183, 183, 183)",*/
-				"rgb(204, 204, 204)", "rgb(217, 217, 217)", /*"rgb(239, 239, 239)", "rgb(243, 243, 243)",*/ "rgb(255, 255, 255)" ],
+				"rgb(204, 204, 204)", "rgb(217, 217, 217)", /*"rgb(239, 239, 239)", "rgb(243, 243, 243)",*/ /*"rgb(255, 255, 255)"*/ ],
 			[ "rgb(152, 0, 0)", "rgb(255, 0, 0)", "rgb(255, 153, 0)", "rgb(255, 255, 0)", "rgb(0, 255, 0)",
 				"rgb(0, 255, 255)", "rgb(74, 134, 232)", "rgb(0, 0, 255)", "rgb(153, 0, 255)", "rgb(255, 0, 255)" ],
 			[ "rgb(230, 184, 175)", "rgb(244, 204, 204)", "rgb(252, 229, 205)", "rgb(255, 242, 204)", "rgb(217, 234, 211)",

WebContent/jfcas04/js/share.js

@@ -121,6 +121,7 @@ function init_share_detail(infos){
 	if(infos.length==1){
 		if(!infos[0].fileImg){
 			$('.shareDetail_container_header>img').attr('src',ctx+'/photo/photo.jsp?ls_photo='+infos[0].FILE_SAVE_PATH+infos[0].FILE_SVAE_NAME);
+			$('.shareDetail_container_header>img').css('border-radius','5px');
 		}
 		else{
 			$('.shareDetail_container_header>img').attr('src',ctx+'/custom/images/'+infos[0].fileImg);
@@ -200,7 +201,7 @@ function init_shareDetail_list(infos){
             		 return '<img style="margin-right:10px;vertical-align:top;" src="'+ctx+'/custom/images/'+ row.fileImg +'" height="44" width="61"><span style="margin-top:12px;display:inline-block;">'+value+'</span>';
               	 }
               	 else{
-              		return '<img style="margin-right:10px;vertical-align:top;" src="'+ctx+'/photo/photo.jsp?ls_photo='+row.FILE_SAVE_PATH+row.FILE_SVAE_NAME+'" height="44" width="61"><span style="margin-top:12px;display:inline-block;">'+value+'</span>';
+              		return '<img style="border-radius:5px;margin-right:10px;vertical-align:top;" src="'+ctx+'/photo/photo.jsp?ls_photo='+row.FILE_SAVE_PATH+row.FILE_SVAE_NAME+'" height="44" width="61"><span style="margin-top:12px;display:inline-block;">'+value+'</span>';
               	 }
              }
          }, {

WebContent/lib/plug/fullcalendar/fullcalendar.js

@@ -7169,7 +7169,7 @@ var DayGrid = /** @class */ (function (_super) {
         }
         else {
             topEl = this.rowEls.eq(row); // will align with top of row
-        }
+        }        
         options = {
             className: 'fc-more-popover ' + view.calendar.theme.getClass('popover'),
             content: this.renderSegPopoverContent(row, col, segs),

WebContent/logoutcas.jsp

@@ -17,7 +17,7 @@
 		return hostname;
 	}
     //登录中心url
-    var loginCenter = "http://localhost:8080/cas-jfsso";
+    var loginCenter = "http://cas.jfbrother.com/cas-jfsso";
     
 	var loginUrl = loginCenter + "/login?service=" + getUrl();
 	//alert("开始登出:"+loginUrl);

src/struts-ext.xml

@@ -70,10 +70,6 @@
 		<action name="office" class="com.jw.app.portlet.action.viewAction" method="office">
 			<result name="office">/jfcas04/office.jsp</result>
 		</action>
-		<!-- 办事大厅的详情页 -->
-		<action name="officeDetail" class="com.jw.app.portlet.action.viewAction" method="officeDetail">
-			<result name="officeDetail">/jfcas04/officeDetail.jsp</result>
-		</action>
 
 		<action name="userchoiceData_*" class="com.jw.app.userchoice.action.dataAction" method="{1}">
 			<result name="json" type="json">

src_jwapp/com/jw/app/business/attendance/AttendanceBusinessImpl.java

@@ -39,7 +39,7 @@ public class AttendanceBusinessImpl implements AttendanceBusiness {
 			entity.put("USER_ID", SessionUtil.getEmid());
 		}
 		if(entity.get("USER_NAME")==null){
-			entity.put("USER_NAME", SessionUtil.getEmname());
+			entity.put("USER_NAME", SessionUtil.getCode());
 		}
 		if(entity.get("DEPT_ID")==null){
 			entity.put("DEPT_ID", SessionUtil.getEmdepart());

src_jwapp/com/jw/app/business/bgmk/BgmkBusinessImpl.java

@@ -38,7 +38,7 @@ public class BgmkBusinessImpl implements BgmkBusiness {
 			entity.put("CREATE_TIME", new Date());
 		}
 		if(entity.get("USER_NAME")==null){
-			entity.put("USER_NAME", SessionUtil.getEmname());
+			entity.put("USER_NAME", SessionUtil.getCode());
 		}
 		if(entity.get("CREATOR_ID")==null){
 			entity.put("CREATOR_ID", SessionUtil.getCode());

src_jwapp/com/jw/app/business/bgmk/bgmkDAO.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.jw.app.business.bgmk.bgmkDAO">
 
 	<insert id="insert_bgmk" parameterType="map">
-		insert into C_T_WORK_BG(
+		insert into WORK_BG(
 		<trim prefix="" suffixOverrides=",">
 			<foreach collection="infoListKey" item="key">
 				${key},
@@ -20,7 +20,7 @@
 
 	<update id="update_bgmk" parameterType="map">
 	       <![CDATA[
-            update C_T_WORK_BG set 
+            update WORK_BG set 
          ]]>
 		<trim prefix="" suffixOverrides=",">
 			<foreach collection="info" item="info">
@@ -36,7 +36,7 @@
 	
 	<delete id="delete_bgmk" parameterType="list">
         <![CDATA[
-            delete from  C_T_WORK_BG where UUID IN
+            delete from  WORK_BG where UUID IN
          ]]>
 		<foreach collection="list" item="UUID" open="(" separator=","
 			close=")">
@@ -47,7 +47,7 @@
 	<select id="list_bgmk" parameterType="map" resultType="upperCaseKeyMap">
 	 <![CDATA[
 	  select f.* 
-	  from C_T_WORK_BG f where 1=1 
+	  from WORK_BG f where 1=1 
      ]]>
 		<if test="UUID != null and UUID != ''">
 			and f.UUID = #{UUID}
@@ -92,7 +92,7 @@
 
 	<select id="listCount_bgmk" parameterType="map" resultType="int">
 	 <![CDATA[
-	   select count(*) c from C_T_WORK_BG f where 1=1 
+	   select count(*) c from WORK_BG f where 1=1 
      ]]>
 		<if test="UUID != null and UUID != ''">
 			and f.UUID = #{UUID}
@@ -137,7 +137,7 @@
 	<select id="list_bgmk_employee" parameterType="map" resultType="upperCaseKeyMap">
 	 <![CDATA[
 	  select f.* 
-	  from C_T_WORK_BG f where 1=1 
+	  from WORK_BG f where 1=1 
      ]]>
 		<if test="UUID != null and UUID != ''">
 			and f.UUID = #{UUID}
@@ -182,7 +182,7 @@
 
 	<select id="listCount_bgmk_employee" parameterType="map" resultType="int">
 	 <![CDATA[
-	   select count(*) c from C_T_WORK_BG f where 1=1 
+	   select count(*) c from WORK_BG f where 1=1 
      ]]>
 		<if test="UUID != null and UUID != ''">
 			and f.UUID = #{UUID}

src_jwapp/com/jw/app/business/friendlink/FriendLinkBusinessImpl.java

 package com.jw.app.business.friendlink;
 
+import java.text.BreakIterator;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Date;
@@ -61,6 +62,7 @@ public class FriendLinkBusinessImpl implements FriendLinkBusiness {
 			int count = friendlinkDAO.list_count_friendlink(query);
 			if(count>=8){
 				info.put("ERROR", "-1");
+				throw new BusinessException("");
 			}
 			// 表示新增
 			info.put("UUID", UUID.randomUUID().toString());

src_jwapp/com/jw/app/business/friendlink/friendlinkDAO.xml

@@ -22,7 +22,7 @@
 
 	<select id="list_friendlink" parameterType="map" resultType="upperCaseKeyMap">
 	 <![CDATA[
-	   select * from b_t_ufp_friendlink t
+	   select * from friendlink t
      ]]>
 		<include refid="where" />
 		ORDER BY t.sort 
@@ -30,14 +30,14 @@
 
 	<select id="list_count_friendlink" parameterType="map" resultType="int">
 	 <![CDATA[
-	   select count(*) from b_t_ufp_friendlink t
+	   select count(*) from friendlink t
      ]]>
 		<include refid="where" />
 		ORDER BY t.sort 
 	</select>
 
 	<insert id="insert_friendlink" parameterType="java.util.List">
-		insert into b_t_ufp_friendlink(
+		insert into friendlink(
 		<trim prefix="" suffixOverrides=",">
 			<foreach collection="list" item="field">
 				${field.key},
@@ -53,7 +53,7 @@
 	</insert>
 
 	<update id="update_friendlink" parameterType="java.util.List">
-		update b_t_ufp_friendlink set
+		update friendlink set
 		<trim prefix="" suffixOverrides=",">
 			<foreach collection="list" item="field">
 				${field.key}=#{field.value},
@@ -63,6 +63,6 @@
 	</update>
 
 	<delete id="delete_friendlink" parameterType="String">
-		delete from b_t_ufp_friendlink where UUID=#{uuid}
+		delete from friendlink where UUID=#{uuid}
 	</delete>
 </mapper>
\ No newline at end of file

src_jwapp/com/jw/app/business/notice/noticeDAO.xml

@@ -22,7 +22,7 @@
 
 	<select id="list_notice" parameterType="map" resultType="upperCaseKeyMap">
 	 <![CDATA[
-	   select * from b_t_ufp_notice t
+	   select * from notice t
      ]]>
 		<include refid="where" />
 		ORDER BY t.CREATE_TIME 
@@ -30,14 +30,14 @@
 
 	<select id="list_count_notice" parameterType="map" resultType="int">
 	 <![CDATA[
-	   select count(*) from b_t_ufp_notice t
+	   select count(*) from notice t
      ]]>
 		<include refid="where" />
 		ORDER BY t.CREATE_TIME 
 	</select>
 
 	<insert id="insert_notice" parameterType="java.util.List">
-		insert into b_t_ufp_notice(
+		insert into notice(
 		<trim prefix="" suffixOverrides=",">
 			<foreach collection="list" item="field">
 				${field.key},
@@ -53,7 +53,7 @@
 	</insert>
 
 	<update id="update_notice" parameterType="java.util.List">
-		update b_t_ufp_notice set
+		update notice set
 		<trim prefix="" suffixOverrides=",">
 			<foreach collection="list" item="field">
 				${field.key}=#{field.value},
@@ -63,6 +63,6 @@
 	</update>
 
 	<delete id="delete_notice" parameterType="String">
-		delete from b_t_ufp_notice where UUID=#{uuid}
+		delete from notice where UUID=#{uuid}
 	</delete>
 </mapper>
\ No newline at end of file

src_jwapp/com/jw/app/portlet/action/viewAction.java

@@ -58,9 +58,5 @@ public class viewAction extends BasicAction {
     public String office() throws BusinessException {
     	return "office";
     }
-   
-    public String officeDetail() throws BusinessException {
-    	return "officeDetail";
-    }
     
 }