修改

src/main/java/com/jeeplus/modules/workchangejob/service/WorkChangeJobService.java

@@ -220,7 +220,7 @@ public class WorkChangeJobService extends CrudService<WorkChangeJobDao, WorkChan
 					);
 
 			List<User> users = new ArrayList<>();
-			List<User> rszrList = UserUtils.findRszrList(createUser);
+			List<User> rszrList = UserUtils.getByRoleActivityEnname("rsbzr",3,office.getId(),"23",workChangeJob.getCreateBy());
 			List<User> fgldList = UserUtils.getByRoleActivityEnname("fzjl",3,office.getId(),"23",workChangeJob.getCreateBy());
 			List<User> zjlList = UserUtils.getByRoleActivityEnname("zjl",3,office.getId(),"23",workChangeJob.getCreateBy());
 			if (StringUtils.isNotBlank(workActivityMenu.getId())) {

src/main/java/com/jeeplus/modules/workchangejob/web/WorkChangeJobController.java

@@ -301,7 +301,7 @@ public class WorkChangeJobController extends BaseController {
 				users = UserUtils.getByProssType(workChangeJob.getProcessInstanceId(),2);
 				if (users==null ) {
 //					users = UserUtils.getByRoleActivityEnname("fgld", 3, workRegularApply.getOfficeId(), "19", user);
-					users = UserUtils.getByRoleActivityEnname("fzjl", 3, workChangeJob.getOfficeId(), "66", workChangeJob.getCreateBy());
+					users = UserUtils.getByRoleActivityEnname("rsbzr", 3, workChangeJob.getOfficeId(), "66", workChangeJob.getCreateBy());
 				}
 			}else  if ("fgld".equals(taskDefKey)){
 				users = UserUtils.getByProssType(workChangeJob.getProcessInstanceId(),3);

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

@@ -231,7 +231,6 @@ public class WorkRegularApplyService extends CrudService<WorkRegularApplyDao, Wo
 			Map<String, Object> variables = new HashMap<String, Object>();
 			identityService.setAuthenticatedUserId(workRegularApply.getCurrentUser().getId());
 			User user = UserUtils.getUser();
-			List<User> fgldList = null;
 //			User user=userDao.get(workRegularApply.getUserId());
 			String contentStr = "转正人:"+ user.getName()+"，转正日期:"+ DateUtils.formatDate(workRegularApply.getApplyDate());
 			String titleStr = "转正人:"+user.getName();
@@ -244,9 +243,9 @@ public class WorkRegularApplyService extends CrudService<WorkRegularApplyDao, Wo
 			rsbzr.setEnname("rsbzr");
 			rsbzr.setCompany(office);
 			Role role = roleDao.getByEnname(rsbzr);
-			if(role != null) {
-				fgldList = userDao.findUserByRoleId(role.getId(), comId);
-			}
+//			if(role != null) {
+//				fgldList = userDao.findUserByRoleId(role.getId(), comId);
+//			}
 			WorkActivityMenu workActivityMenu = workActivityMenuService.findByParentAndOffice("zzsql3125f1f194c82bdea9mrlcc750904", applyOffice);
 			// 启动流程
 			String processType = workActivityMenu.getProcessType();
@@ -268,6 +267,7 @@ public class WorkRegularApplyService extends CrudService<WorkRegularApplyDao, Wo
 			List<User> bmzrList = UserUtils.getByRoleActivityEnname("bmzr",2,applyOffice.getId(),"22",user);
 			List<User> fzjlList = UserUtils.getByRoleActivityEnname("fzjl",3,applyOffice.getId(),"22",user);
 			List<User> zjlList = UserUtils.getByRoleActivityEnname("zjl",3,applyOffice.getId(),"22",user);
+			List<User> fgldList = UserUtils.getByRoleActivityEnname("rsbzr",3,applyOffice.getId(),"22",user);
 //			List<User> rlzyList = UserUtils.getByRoleActivityEnname("rlzy",3,applyOffice.getId(),"22",user);
 			if (StringUtils.isNotBlank(workActivityMenu.getId())) {
 				workProjectNotify.setNotifyRole("");
@@ -714,7 +714,7 @@ public class WorkRegularApplyService extends CrudService<WorkRegularApplyDao, Wo
 //				UserUtils.pushMeIm(u.getId());
 //			}
 //		}
-
+		dao.update(workRegularApply);
 		return "保存审核意见成功！";
 	}
 	/**

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

@@ -359,17 +359,8 @@ public class WorkRegularApplyController extends BaseController {
 //			}
 			if ("bmzr".equals(taskDefKey)){
 				users = UserUtils.getByProssType(workRegularApply.getProcessInstanceId(),2);
-				if (users==null ) {
-//					users = UserUtils.getByRoleActivityEnname("fgld", 3, workRegularApply.getOfficeId(), "19", user);
-					String comId = user.getComId();
-					Role rsbzr = new Role();
-					Office office = new Office();
-					office.setId(comId);
-					rsbzr.setEnname("rsbzr");
-					rsbzr.setCompany(office);
-					Role role = roleDao.getByEnname(rsbzr);
-					users = userDao.findUserByRoleId(role.getId(), comId);
-				}
+				if (users==null )
+					users = UserUtils.getByRoleActivityEnname("rsbzr", 3, applyOffice.getId(), "18", user);
 			}else  if ("fgld".equals(taskDefKey)){
 				users = UserUtils.getByProssType(workRegularApply.getProcessInstanceId(),3);
 				if (users==null )

src/main/java/com/jeeplus/modules/workresignation/service/WorkResignationService.java

@@ -243,7 +243,7 @@ public class WorkResignationService extends CrudService<WorkResignationDao, Work
 		List<User> bmzrs = UserUtils.getByRoleActivityEnname("bmzr",2,office.getId(),"18",workResignation.getCreateBy());
 		List<User> fglds = UserUtils.getByRoleActivityEnname("fzjl",3,office.getId(),"18",workResignation.getCreateBy());
 		List<User> zjls = UserUtils.getByRoleActivityEnname("zjl",3,office.getId(),"18",workResignation.getCreateBy());
-		List<User> rlzys = UserUtils.findRszrList(UserUtils.getUser());
+		List<User> rlzys = UserUtils.getByRoleActivityEnname("rsbzr",3,office.getId(),"18",workResignation.getCreateBy());
 		if (StringUtils.isNotBlank(workActivityMenu.getId())) {
 			workProjectNotify.setNotifyRole("");
 			workActivityMenu = workActivityMenuService.get(workActivityMenu.getId());

src/main/java/com/jeeplus/modules/workresignation/web/WorkResignationController.java

@@ -339,7 +339,8 @@ public class WorkResignationController extends BaseController {
 			if ("bmzr".equals(taskDefKey)){
 				users = UserUtils.getByProssType(workResignation.getProcessInstanceId(),2);
 				if (users==null )
-					users = UserUtils.findRszrList(UserUtils.getUser());
+//					users = UserUtils.findRszrList(UserUtils.getUser());
+				    users = UserUtils.getByRoleActivityEnname("rsbzr", 3, workResignation.getOfficeId(), "18", workResignation.getCreateBy());
 			}else  if ("fgld".equals(taskDefKey)){
 				users = UserUtils.getByProssType(workResignation.getProcessInstanceId(),3);
 				if (users==null )

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

@@ -742,7 +742,7 @@ 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());
+        List<User> rszrList = UserUtils.getByRoleActivityEnname("rsbzr", 3, UserUtils.getSelectOffice().getId(), "22", UserUtils.getUser());
         rlzyList.addAll(rszrList);
         if (rlzyList.size()==0 ){
             return "流程审批人不能为空,请联系管理员！";