Merge branch 'master' of http://192.168.2.4:3000/chengqiang/total_process

 Conflicts:

	src/main/java/com/jeeplus/modules/iim/web/ContactController.java

src/main/java/com/jeeplus/modules/iim/web/ContactController.java

@@ -509,7 +509,6 @@ 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(",");
 //                    }

src/main/java/com/jeeplus/modules/workincomingmessage/service/WorkIncomingMessageService.java

@@ -358,7 +358,8 @@ public class WorkIncomingMessageService extends CrudService<WorkIncomingMessageD
                     exp = "pass";
                     if ("yes".equals(workIncomingMessage.getAct().getFlag())) {
                         workActivityProcessService.insertAuditsByType(auditUsers,workIncomingMessage.getProcessInstanceId(),2,1);
-
+                        vars.put("zjlList", auditUsers);
+                        vars.put("zjlCount",auditUsers.size());
                         notifyRole = "总经理审核";
                         workActivityProcess.setIsApproval("1");
                         enname = "zjl";
@@ -723,7 +724,8 @@ public class WorkIncomingMessageService extends CrudService<WorkIncomingMessageD
             UserUtils.pushInfoToApp(titleStr, contentStr,extras,u.getId());
         }
         UserUtils.pushIm(userIds,contentStr);
-
+        variables.put("xzzgCount",xzzgList.size());
+        variables.put("xzzgList",xzzgList);
         variables.put("busId", businessKey);
         variables.put("type", processType);
         variables.put("title", "审批单：" + workIncomingMessage.getNum());//设置标题；

src/main/java/com/jeeplus/modules/workregularapply/web/WorkRegularApplyController.java

@@ -294,7 +294,7 @@ public class WorkRegularApplyController extends BaseController {
 	@RequestMapping(value = "saveAudit")
 	public String saveAudit(WorkRegularApply workRegularApply, Model model,
 							RedirectAttributes redirectAttributes) {
-//		try {
+		try {
 			// 对不同环节的业务逻辑进行操作
 			String taskDefKey = workRegularApply.getAct().getTaskDefKey();
 			User user=userDao.get(workRegularApply.getUserId());
@@ -331,10 +331,10 @@ public class WorkRegularApplyController extends BaseController {
 				String str = workRegularApplyService.auditSave(workRegularApply,users);
 				addMessage(redirectAttributes, str);
 			}
-//		}catch (Exception e){
-//			logger.info("Exception e:"+e);
-//			addMessage(redirectAttributes, "审批失败");
-//		}
+		}catch (Exception e){
+			logger.info("Exception e:"+e);
+			addMessage(redirectAttributes, "审批失败");
+		}
 		if (StringUtils.isNotBlank(workRegularApply.getHome()) && "home".equals(workRegularApply.getHome())) {
 			return "redirect:" + Global.getAdminPath() + "/home/?repage";
 		} else {