user4 5 年之前
父節點
當前提交
3aedbe7651

+ 4 - 3
src/main/java/com/jeeplus/modules/iim/web/ContactController.java

@@ -509,9 +509,10 @@ public class ContactController extends BaseController {
                     if((ids!=null&&ids.contains(u.getId()))||currentUser.getId().equals(u.getId())){
                         continue;
                     }
-                    if("online".equals(SmackUtils.IsUserOnLine(u.getId()))){
-                        stringBuilder.append(u.getId()).append(",");
-                    }
+//                    暂时注释,有异常
+//                    if("online".equals(SmackUtils.IsUserOnLine(u.getId()))){
+//                        stringBuilder.append(u.getId()).append(",");
+//                    }
                 }
             }
         }

+ 13 - 0
src/main/webapp/webpage/modules/leaveapply/leaveApplyForm.jsp

@@ -4,10 +4,12 @@
 <head>
 	<title>请假管理</title>
 	<meta name="decorator" content="default"/>
+	<script src="${ctx}/act/rest/js/common/common.js" charset="UTF-8"></script>
 	<script type="text/javascript">
         var validateForm;
         var count1 = 0;
         $(document).ready(function() {
+
             checkContentKeyUp('reason',128);
             if($("#applyTime").val()==null || $("#applyTime").val()==''){
                 $("#applyTime").val(getNowFormatDate());
@@ -50,6 +52,15 @@
             });
 
         });
+
+        function setNo(){
+        	var date = new Date();
+        	var Y = date.getFullYear();
+        	var M = date.getMonth()+1;
+        	var D = date.getDate();
+        	var ran = (Math.random()*10)
+		}
+
         function doSubmit(obj){//回调函数,在编辑和保存动作时,供openDialog调用提交表单。
             var idArr = $("#leaveDetailList tr:visible");
             if(idArr.length<1){
@@ -295,6 +306,8 @@
             $("#addFile"+divId).show();
             multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,size);}
         }
+
+
 	</script>
 	<style>
 		/*超过5个汉字,调整label的长度,以下是配套的*/