Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/workregularapply/service/WorkRegularApplyService.java

@@ -479,88 +479,6 @@ public class WorkRegularApplyService extends CrudService<WorkRegularApplyDao, Wo
 				if (!workActivityProcess.getIsApproval().equals("0")) {
 					workActivityProcess.setId("");
 				}
-//				// 审核环节
-//				if ("zzr".equals(taskDefKey) && count.contains("1")) {
-//					taskCount = "1";
-//					exp = "pass";
-//					if ("yes".equals(flag)) {
-//						workActivityProcessService.insertAuditsByType(auditUsers,workRegularApply.getProcessInstanceId(),2,1);
-//						vars.put("ywbfzrList", auditUsers);
-//						vars.put("ywbfzrCount",auditUsers.size());
-//						notifyRole = "部门主任审核";
-//						workActivityProcess.setIsApproval("1");
-//						enname = "bmzr";
-//					} else {
-//						notifyRole = "转正人补充信息";
-//						workActivityProcess.setIsApproval("2");
-//					}
-//					break;
-//				}
-//				// 审核环节
-//				else if ("ywbfzr".equals(taskDefKey) && count.contains("2")) {
-//					taskCount = "2";
-//					exp = "pass";
-//					if ("yes".equals(flag)) {
-//						workActivityProcessService.insertAuditsByType(auditUsers,workRegularApply.getProcessInstanceId(),3,1);
-//						vars.put("fgldList", auditUsers);
-//						vars.put("fgldCount",auditUsers.size());
-//						notifyRole = "分管领导审核";
-//						workActivityProcess.setIsApproval("1");
-//						enname = "fgld";
-//					} else {
-//						notifyRole = "转正人补充信息";
-//						workActivityProcess.setIsApproval("2");
-//					}
-//					break;
-//				} else if ("fgld".equals(taskDefKey) && count.contains("3")) {
-//					taskCount = "3";
-//					exp = "pass";
-//					if ("yes".equals(flag)) {
-//						workActivityProcessService.insertAuditsByType(auditUsers,workRegularApply.getProcessInstanceId(),4,1);
-//						vars.put("zjlList", auditUsers);
-//						vars.put("zjlCount",auditUsers.size());
-//						notifyRole = "总经理审核";
-//						workActivityProcess.setIsApproval("1");
-//						enname = "zjl";
-//					} else {
-//						notifyRole = "转正人补充信息";
-//						workActivityProcess.setIsApproval("2");
-//					}
-//					break;
-//				}else if ("zjl".equals(taskDefKey) && count.contains("4")) {
-//					taskCount = "4";
-//					exp = "pass";
-//					if ("yes".equals(flag)) {
-//						workActivityProcessService.insertAuditsByType(auditUsers,workRegularApply.getProcessInstanceId(),5,1);
-//						vars.put("rlzyList", auditUsers);
-//						vars.put("rlzyCount",auditUsers.size());
-//						notifyRole = "人力专员审核";
-//						workActivityProcess.setIsApproval("1");
-//						enname = "rlzy";
-//					} else {
-//						notifyRole = "转正人补充信息";
-//						workActivityProcess.setIsApproval("2");
-//					}
-//					break;
-//				} else if ("rlzy".equals(taskDefKey) && count.contains("5")) {
-//					taskCount = "5";
-//					exp = "pass";
-//					if ("yes".equals(flag)) {
-//						notifyRole = "审批通过";
-//						workActivityProcess.setIsApproval("1");
-//						WorkStaffBasicInfo workStaffBasicInfo=workStaffAchivesDao.get(workRegularApply.getBasicInfoId()) ;
-//						workStaffBasicInfo.setId(workRegularApply.getBasicInfoId());
-//						workStaffBasicInfo.setStatus("正式");
-//						WorkJobGrade workJobGrade=workJobGradeDao.get(workRegularApply.getJobGrade().getId());
-//						workStaffBasicInfo.setJobGrade(workJobGrade);
-//						workStaffBasicInfo.setSalary(workJobGrade.getPay());
-//						workStaffBasicInfo.setTryEndTime(workRegularApply.getCorrectDate());
-//						workStaffAchivesDao.update(workStaffBasicInfo);
-//					} else {
-//						notifyRole = "转正人补充信息";
-//						workActivityProcess.setIsApproval("2");
-//					}
-//					break;
 				// 审核环节
 				if ("bmzr".equals(taskDefKey) && count.contains("1")) {
 					taskCount = "1";
@@ -608,6 +526,7 @@ public class WorkRegularApplyService extends CrudService<WorkRegularApplyDao, Wo
 		workRegularApply.preUpdate();
 		// 提交流程任务
 		vars.put(exp, "yes".equals(flag) ? true : false);
+		vars.put("passs", true);
 		workActivityProcessService.updateProcessRegular(workActivityProcess,workActivityMenu,key,taskCount,workRegularApply.getProcessInstanceId(),taskDefKey,"modifyApply",flag,comment, activities);
 		// 提交流程任务
 		actTaskService.complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);

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

@@ -326,7 +326,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());
@@ -392,10 +392,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 {

src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffBasicInfoService.java

@@ -721,6 +721,8 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
                 titleStr, contentStr,"86","0",remark,"");
         List<String> userIds = new ArrayList<>();
         List<User> rlzyList = UserUtils.getByRoleActivityEnname("rlzy",3,UserUtils.getSelectOffice().getId(),"22",UserUtils.getUser());
+        List<User> rszrList = UserUtils.findRszrList(UserUtils.getUser());
+        rlzyList.addAll(rszrList);
         if (rlzyList.size()==0 ){
             return "流程审批人不能为空,请联系管理员！";
         }