1111

src/main/java/com/jeeplus/modules/leaveapply/service/LeaveApplyService.java

@@ -319,7 +319,6 @@ public class LeaveApplyService extends CrudService<LeaveApplyDao, LeaveApply> {
             identityService.setAuthenticatedUserId(leaveApply.getCurrentUser().getId());
             User createUser = UserUtils.getUser();
             String contentStr = "请假编号：" + leaveApply.getNo() + "，请假日期：" + DateUtils.formatDate(leaveApply.getApplyTime());
-            userDao.get(leaveApply.getApplyer()).getName();
             String titleStr = "请假人：" + userDao.get(leaveApply.getApplyer()).getName();
 
             String businessKey = leaveApply.getId();
@@ -330,13 +329,16 @@ public class LeaveApplyService extends CrudService<LeaveApplyDao, LeaveApply> {
             StringBuffer buffer = new StringBuffer();
             Activity activity = new Activity();
             WorkProjectNotify workProjectNotify = UtilNotify
-                    .saveNotify(leaveApply.getId(), null, leaveApply.getCompanyId(), titleStr, contentStr, "80", "0", "待审批", ""
-                    );
+                    .saveNotify(leaveApply.getId(), null, leaveApply.getCompanyId(), titleStr, contentStr, "80", "0", "待审批", "");
 
             List<User> users = new ArrayList<>();
+//            部门责任人
             List<User> bmzrList = UserUtils.getByRoleActivityEnname("bmzr", 2, office.getId(), "25", leaveApply.getCreateBy());
+//            分管领导
             List<User> fgldList = UserUtils.getByRoleActivityEnname("fgld", 2, office.getId(), "25", leaveApply.getCreateBy());
+//            总经理
             List<User> zjlList = UserUtils.getByRoleActivityEnname("zjl", 3, office.getId(), "25", leaveApply.getCreateBy());
+
             if (StringUtils.isNotBlank(workActivityMenu.getId())) {
                 workProjectNotify.setNotifyRole("");
                 workActivityMenu = workActivityMenuService.get(workActivityMenu.getId());
@@ -384,6 +386,8 @@ public class LeaveApplyService extends CrudService<LeaveApplyDao, LeaveApply> {
                 processType = "leaveApply";
                 users.addAll(bmzrList);
             }
+
+//            向每个部门负责人发送审批通知
             List<String> userIds = new ArrayList<>(users.size());
             for (User u : users) {
                 userIds.add(u.getId());

src/main/java/com/jeeplus/modules/leaveapply/web/LeaveApplyController.java

@@ -169,7 +169,7 @@ public class LeaveApplyController extends BaseController {
 
 
 	/**
-	 * 保存请假申请
+	 * 保存请假申请,送审
 	 */
 	//@RequiresPermissions(value={"leaveapply:leaveApply:add","leaveapply:leaveApply:edit"},logical=Logical.OR)
 	@RequestMapping(value = "save")

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

@@ -99,7 +99,7 @@ public class WorkRegularApplyController extends BaseController {
 	}
 
 	/**
-	 * 查看，增加，编辑转正申请表单页面
+	 * 查看1，增加，编辑转正申请表单页面
 	 */
 	@RequiresPermissions(value={"workregularapply:workRegularApply:view","workregularapply:workRegularApply:add","workregularapply:workRegularApply:edit"},logical=Logical.OR)
 	@RequestMapping(value = "form")
@@ -152,7 +152,7 @@ public class WorkRegularApplyController extends BaseController {
 		return "redirect:"+Global.getAdminPath()+"/workregularapply/workRegularApply/?repage";
 	}
 	/**
-	 * 保存转正申请
+	 * 保存转正申请,并送审
 	 */
 	@RequiresPermissions(value={"workregularapply:workRegularApply:add","workregularapply:workRegularApply:edit"},logical=Logical.OR)
 	@RequestMapping(value = "save")