Kaynağa Gözat

人力资源模块,登录模块修改

蔡德晨 5 yıl önce
ebeveyn
işleme
696cf8eecd
100 değiştirilmiş dosya ile 678 ekleme ve 88 silme
  1. 12 0
      src/main/java/com/jeeplus/modules/sys/security/SystemAuthorizingRealm.java
  2. 39 2
      src/main/java/com/jeeplus/modules/sys/utils/UserUtils.java
  3. 20 0
      src/main/java/com/jeeplus/modules/sys/web/RegisterController.java
  4. 7 3
      src/main/java/com/jeeplus/modules/sys/web/UserController.java
  5. 27 58
      src/main/java/com/jeeplus/modules/workchangejob/service/WorkChangeJobService.java
  6. 6 17
      src/main/java/com/jeeplus/modules/workchangejob/web/WorkChangeJobController.java
  7. 6 0
      src/main/java/com/jeeplus/modules/workstaff/dao/WorkStaffBasicInfoDao.java
  8. 8 0
      src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffBasicInfoService.java
  9. 27 4
      src/main/java/com/jeeplus/modules/workstaff/web/WorkStaffBasicInfoController.java
  10. 5 4
      src/main/resources/jeeplus.properties
  11. 24 0
      src/main/resources/mappings/modules/workstaff/WorkStaffBasicInfoDao.xml
  12. 2 0
      src/main/resources/spring-context-shiro.xml
  13. 2 0
      src/main/webapp/static/layui/css/layui.css
  14. 2 0
      src/main/webapp/static/layui/css/layui.mobile.css
  15. 2 0
      src/main/webapp/static/layui/css/modules/code.css
  16. 2 0
      src/main/webapp/static/layui/css/modules/laydate/default/laydate.css
  17. BIN
      src/main/webapp/static/layui/css/modules/layer/default/icon-ext.png
  18. BIN
      src/main/webapp/static/layui/css/modules/layer/default/icon.png
  19. 2 0
      src/main/webapp/static/layui/css/modules/layer/default/layer.css
  20. BIN
      src/main/webapp/static/layui/css/modules/layer/default/loading-0.gif
  21. BIN
      src/main/webapp/static/layui/css/modules/layer/default/loading-1.gif
  22. BIN
      src/main/webapp/static/layui/css/modules/layer/default/loading-2.gif
  23. BIN
      src/main/webapp/static/layui/font/iconfont.eot
  24. 485 0
      src/main/webapp/static/layui/font/iconfont.svg
  25. BIN
      src/main/webapp/static/layui/font/iconfont.ttf
  26. BIN
      src/main/webapp/static/layui/font/iconfont.woff
  27. BIN
      src/main/webapp/static/layui/font/iconfont.woff2
  28. BIN
      src/main/webapp/static/layui/images/face/0.gif
  29. BIN
      src/main/webapp/static/layui/images/face/1.gif
  30. BIN
      src/main/webapp/static/layui/images/face/10.gif
  31. BIN
      src/main/webapp/static/layui/images/face/11.gif
  32. BIN
      src/main/webapp/static/layui/images/face/12.gif
  33. BIN
      src/main/webapp/static/layui/images/face/13.gif
  34. BIN
      src/main/webapp/static/layui/images/face/14.gif
  35. BIN
      src/main/webapp/static/layui/images/face/15.gif
  36. BIN
      src/main/webapp/static/layui/images/face/16.gif
  37. BIN
      src/main/webapp/static/layui/images/face/17.gif
  38. BIN
      src/main/webapp/static/layui/images/face/18.gif
  39. BIN
      src/main/webapp/static/layui/images/face/19.gif
  40. BIN
      src/main/webapp/static/layui/images/face/2.gif
  41. BIN
      src/main/webapp/static/layui/images/face/20.gif
  42. BIN
      src/main/webapp/static/layui/images/face/21.gif
  43. BIN
      src/main/webapp/static/layui/images/face/22.gif
  44. BIN
      src/main/webapp/static/layui/images/face/23.gif
  45. BIN
      src/main/webapp/static/layui/images/face/24.gif
  46. BIN
      src/main/webapp/static/layui/images/face/25.gif
  47. BIN
      src/main/webapp/static/layui/images/face/26.gif
  48. BIN
      src/main/webapp/static/layui/images/face/27.gif
  49. BIN
      src/main/webapp/static/layui/images/face/28.gif
  50. BIN
      src/main/webapp/static/layui/images/face/29.gif
  51. BIN
      src/main/webapp/static/layui/images/face/3.gif
  52. BIN
      src/main/webapp/static/layui/images/face/30.gif
  53. BIN
      src/main/webapp/static/layui/images/face/31.gif
  54. BIN
      src/main/webapp/static/layui/images/face/32.gif
  55. BIN
      src/main/webapp/static/layui/images/face/33.gif
  56. BIN
      src/main/webapp/static/layui/images/face/34.gif
  57. BIN
      src/main/webapp/static/layui/images/face/35.gif
  58. BIN
      src/main/webapp/static/layui/images/face/36.gif
  59. BIN
      src/main/webapp/static/layui/images/face/37.gif
  60. BIN
      src/main/webapp/static/layui/images/face/38.gif
  61. BIN
      src/main/webapp/static/layui/images/face/39.gif
  62. BIN
      src/main/webapp/static/layui/images/face/4.gif
  63. BIN
      src/main/webapp/static/layui/images/face/40.gif
  64. BIN
      src/main/webapp/static/layui/images/face/41.gif
  65. BIN
      src/main/webapp/static/layui/images/face/42.gif
  66. BIN
      src/main/webapp/static/layui/images/face/43.gif
  67. BIN
      src/main/webapp/static/layui/images/face/44.gif
  68. BIN
      src/main/webapp/static/layui/images/face/45.gif
  69. BIN
      src/main/webapp/static/layui/images/face/46.gif
  70. BIN
      src/main/webapp/static/layui/images/face/47.gif
  71. BIN
      src/main/webapp/static/layui/images/face/48.gif
  72. BIN
      src/main/webapp/static/layui/images/face/49.gif
  73. BIN
      src/main/webapp/static/layui/images/face/5.gif
  74. BIN
      src/main/webapp/static/layui/images/face/50.gif
  75. BIN
      src/main/webapp/static/layui/images/face/51.gif
  76. BIN
      src/main/webapp/static/layui/images/face/52.gif
  77. BIN
      src/main/webapp/static/layui/images/face/53.gif
  78. BIN
      src/main/webapp/static/layui/images/face/54.gif
  79. BIN
      src/main/webapp/static/layui/images/face/55.gif
  80. BIN
      src/main/webapp/static/layui/images/face/56.gif
  81. BIN
      src/main/webapp/static/layui/images/face/57.gif
  82. BIN
      src/main/webapp/static/layui/images/face/58.gif
  83. BIN
      src/main/webapp/static/layui/images/face/59.gif
  84. BIN
      src/main/webapp/static/layui/images/face/6.gif
  85. BIN
      src/main/webapp/static/layui/images/face/60.gif
  86. BIN
      src/main/webapp/static/layui/images/face/61.gif
  87. BIN
      src/main/webapp/static/layui/images/face/62.gif
  88. BIN
      src/main/webapp/static/layui/images/face/63.gif
  89. BIN
      src/main/webapp/static/layui/images/face/64.gif
  90. BIN
      src/main/webapp/static/layui/images/face/65.gif
  91. BIN
      src/main/webapp/static/layui/images/face/66.gif
  92. BIN
      src/main/webapp/static/layui/images/face/67.gif
  93. BIN
      src/main/webapp/static/layui/images/face/68.gif
  94. BIN
      src/main/webapp/static/layui/images/face/69.gif
  95. BIN
      src/main/webapp/static/layui/images/face/7.gif
  96. BIN
      src/main/webapp/static/layui/images/face/70.gif
  97. BIN
      src/main/webapp/static/layui/images/face/71.gif
  98. BIN
      src/main/webapp/static/layui/images/face/8.gif
  99. BIN
      src/main/webapp/static/layui/images/face/9.gif
  100. 0 0
      src/main/webapp/static/layui/lay/modules/carousel.js

+ 12 - 0
src/main/java/com/jeeplus/modules/sys/security/SystemAuthorizingRealm.java

@@ -9,6 +9,7 @@ import com.jeeplus.common.utils.Encodes;
 import com.jeeplus.common.utils.JedisUtils;
 import com.jeeplus.common.utils.SpringContextHolder;
 import com.jeeplus.common.web.Servlets;
+import com.jeeplus.modules.sys.dao.UserDao;
 import com.jeeplus.modules.sys.entity.*;
 import com.jeeplus.modules.sys.service.OfficeService;
 import com.jeeplus.modules.sys.service.SystemService;
@@ -61,6 +62,9 @@ public class SystemAuthorizingRealm extends AuthorizingRealm {
 	private OfficeService officeService;
 
 	@Autowired
+	private UserDao userDao;
+
+	@Autowired
 	HttpServletRequest request;
 
 	/**
@@ -97,6 +101,14 @@ public class SystemAuthorizingRealm extends AuthorizingRealm {
 			if (user ==null || StringUtils.isBlank(user.getId())){
 				throw new AuthenticationException("msg:登录失败, 该用户未注册.");
 			}
+			//多用户校验
+		    User user1 = new User();
+			String loginName = token.getUsername();
+		    user1.setName(loginName);
+		    List<User> list = userDao.getByName(user1);
+		    if(list != null && list.size()>1){
+			    throw new AuthenticationException("msg:"+loginName+"存在重名.");
+		    }
 			if (user !=null && user.getCompany()!=null && StringUtils.isNotBlank(user.getCompany().getUseable()) && "2".equals(user.getCompany().getUseable())){
 				throw new AuthenticationException("msg:登录失败, 该用户当前所在公司已被禁用.");
 			}

+ 39 - 2
src/main/java/com/jeeplus/modules/sys/utils/UserUtils.java

@@ -23,9 +23,11 @@ import com.jeeplus.modules.workactivity.entity.WorkActivityProcessUser;
 import com.jeeplus.modules.workjobgrade.entity.WorkJobGrade;
 import com.jeeplus.modules.workjobgrade.service.WorkJobGradeService;
 import com.jeeplus.modules.workstaff.dao.WorkStaffAchivesDao;
+import com.jeeplus.modules.workstaff.dao.WorkStaffBasicInfoDao;
 import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.UnavailableSecurityManagerException;
+import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.session.InvalidSessionException;
 import org.apache.shiro.session.Session;
 import org.apache.shiro.subject.Subject;
@@ -57,6 +59,7 @@ public class UserUtils {
 	private static SysParameterValueDao sysParameterValueDao = SpringContextHolder.getBean(SysParameterValueDao.class);
 	private static SysParameterDao sysParameterDao = SpringContextHolder.getBean(SysParameterDao.class);
 	private static WorkStaffAchivesDao workStaffAchivesDao = SpringContextHolder.getBean(WorkStaffAchivesDao.class);
+	private static WorkStaffBasicInfoDao workStaffBasicInfoDao = SpringContextHolder.getBean(WorkStaffBasicInfoDao.class);
 
 	public static final String USER_CACHE = "userCache";
 	public static final String USER_CACHE_ID_BRANCHOFFICE = "branchoffice_id_";
@@ -146,12 +149,23 @@ public class UserUtils {
 		if (user == null){
 			User user1 = new User();
 			Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
-			if(pattern.matcher(loginName).matches() || loginName.equals("admin")){
+			if(loginName.length()==18){
+               WorkStaffBasicInfo workStaffBasicInfo = workStaffBasicInfoDao.findByCard(loginName);
+               if(workStaffBasicInfo == null){
+               	  return null;
+			   }
+               String loginName1 = workStaffBasicInfo.getMobile();
+				user1.setLoginName(loginName1);
+				user = userDao.getByLoginName(user1);
+			} else if(pattern.matcher(loginName).matches() || loginName.equals("admin")){
 				user1.setLoginName(loginName);
 				user = userDao.getByLoginName(user1);
 			}else {
 				user1.setName(loginName);
 				List<User> list = userDao.getByName(user1);
+//				if(list != null && list.size()>1){
+//					throw new AuthenticationException("msg:"+loginName+"存在重名.");
+//				}
 				if(list != null && list.size()>0){
 				   user = list.get(0);
 				}
@@ -181,7 +195,15 @@ public class UserUtils {
 		User user = new User();
 		User user1 = new User();
 		Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
-		if(pattern.matcher(loginName).matches() || loginName.equals("admin")){
+		if(loginName.length()==18){
+			WorkStaffBasicInfo workStaffBasicInfo = workStaffBasicInfoDao.findByCard(loginName);
+			if(workStaffBasicInfo == null){
+				return null;
+			}
+			String loginName1 = workStaffBasicInfo.getMobile();
+			user1.setLoginName(loginName1);
+			user = userDao.getByLoginName(user1);
+		}else if(pattern.matcher(loginName).matches() || loginName.equals("admin")){
 			user1.setLoginName(loginName);
 			user = userDao.getByLoginName(user1);
 		}else {
@@ -1639,4 +1661,19 @@ public class UserUtils {
     public static List<String> findChildOfficeId(Office office) {
         return officeDao.findChildOfficeId(office.getId());
     }
+
+	/**
+	 * 获取人事主任
+	 */
+	public static List<User> findRszrList(User 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);
+		List<User> users = userDao.findUserByRoleId(role.getId(), comId);
+		return users;
+	}
 }

+ 20 - 0
src/main/java/com/jeeplus/modules/sys/web/RegisterController.java

@@ -29,6 +29,7 @@ import redis.clients.jedis.Jedis;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 用户Controller
@@ -420,6 +421,12 @@ public class RegisterController extends BaseController {
 	@RequestMapping(value = "validatePassword")
 	public String validatePassword(HttpServletRequest request,
 									  String password, String loginName) {
+//		User user1 = new User();
+//		user1.setName(loginName);
+//		List<User> list = userDao.getByName(user1);
+//		if(list != null && list.size()>1){
+//			return "cf";
+//		}
 		User user = UserUtils.getByLoginName(loginName);
 		if (user ==null || org.apache.commons.lang3.StringUtils.isBlank(user.getId())){
 			return "false";
@@ -433,5 +440,18 @@ public class RegisterController extends BaseController {
 	}
 
 
+	@ResponseBody
+	@RequestMapping(value = "users")
+	public String validateUser(HttpServletRequest request,
+								   String password, String loginName) {
+		User user1 = new User();
+		user1.setName(loginName);
+		List<User> list = userDao.getByName(user1);
+		if(list != null && list.size()>1){
+			return "false";
+		} else {
+			return "true";
+		}
+	}
 
 }

+ 7 - 3
src/main/java/com/jeeplus/modules/sys/web/UserController.java

@@ -459,6 +459,9 @@ public class UserController extends BaseController {
         return "false";
     }
 
+
+
+
     /**
      * 验证工号是否重复
      * @param oldNo
@@ -826,9 +829,10 @@ public class UserController extends BaseController {
                 model.addAttribute("message", "修改密码失败,旧密码错误");
             }
             if("home".equals(request.getParameter("home"))){
-                model.addAttribute("message", "修改密码成功,请重新登录");
-                SecurityUtils.getSubject().logout();
-                return  "modules/sys/sysHome";
+//                model.addAttribute("message", "修改密码成功,请重新登录");
+//                SecurityUtils.getSubject().logout();
+//                return  "modules/sys/sysHome";
+                return  "redirect:/a/home";
             }
             return "modules/sys/userInfo";
         }

+ 27 - 58
src/main/java/com/jeeplus/modules/workchangejob/service/WorkChangeJobService.java

@@ -216,9 +216,9 @@ public class WorkChangeJobService extends CrudService<WorkChangeJobDao, WorkChan
 					);
 
 			List<User> users = new ArrayList<>();
-			List<User> rlzybzrList = UserUtils.getByRoleActivityEnname("bmzr",2,office.getId(),"23",workChangeJob.getCreateBy());
-			List<User> fgldList = UserUtils.getByRoleActivityEnname("fgld",2,office.getId(),"23",workChangeJob.getCreateBy());
-			List<User> zjlList = UserUtils.getByRoleActivityEnname("zjl",3,office.getId(),"23",workChangeJob.getCreateBy());
+			List<User> rszrList = UserUtils.findRszrList(createUser);
+//			List<User> fgldList = UserUtils.getByRoleActivityEnname("fgld",2,office.getId(),"23",workChangeJob.getCreateBy());
+//			List<User> zjlList = UserUtils.getByRoleActivityEnname("zjl",3,office.getId(),"23",workChangeJob.getCreateBy());
 			if (StringUtils.isNotBlank(workActivityMenu.getId())) {
 				workProjectNotify.setNotifyRole("");
 				workActivityMenu = workActivityMenuService.get(workActivityMenu.getId());
@@ -253,28 +253,28 @@ public class WorkChangeJobService extends CrudService<WorkChangeJobDao, WorkChan
 				}
 				workProjectNotify.setId("");
 			} else {
-				if (rlzybzrList.size()==0 ){
+				if (rszrList.size()==0 ){
 					workChangeJob.setState("1");
 					this.save(workChangeJob);
 					return "流程审批人不能为空,,请联系管理员!";
 				}
-				variables.put("bmzrList", rlzybzrList);
-				variables.put("bmzrCount",rlzybzrList.size());
-				processType = "changeJob";
-				users.addAll(rlzybzrList);
+				variables.put("bmzrList", rszrList);
+				variables.put("bmzrCount",rszrList.size());
+				processType = "rankAdjust";
+				users.addAll(rszrList);
 			}
 			List<String> userIds = new ArrayList<>(users.size());
 			for (User u : users){
 				userIds.add(u.getId());
 				workProjectNotify.setUser(u);
 				workProjectNotify.setId("");
-				workProjectNotify.setNotifyRole("部门负责人审核");
+				workProjectNotify.setNotifyRole("人事主任审核");
 				workProjectNotifyService.save(workProjectNotify);
-				Map<String,Object> extras = new HashMap<>();
-				extras.put("type","7001");
-				extras.put("procDefKey","70");
-				extras.put("id",workProjectNotify.getId());
-				UserUtils.pushInfoToApp(titleStr, contentStr,extras,u.getId());
+//				Map<String,Object> extras = new HashMap<>();
+//				extras.put("type","7001");
+//				extras.put("procDefKey","70");
+//				extras.put("id",workProjectNotify.getId());
+//				UserUtils.pushInfoToApp(titleStr, contentStr,extras,u.getId());
 			}
 			UserUtils.pushIm(userIds,contentStr);
 
@@ -298,13 +298,13 @@ public class WorkChangeJobService extends CrudService<WorkChangeJobDao, WorkChan
 				workActivityProcess.setProcessInstanceId(processInstance.getId());
 				workActivityProcess.setIsApproval("0");
 				workActivityProcessService.insert(workActivityProcess);
-				workActivityProcess.setCount(2);
-				workActivityProcessService.insert(workActivityProcess);
-				workActivityProcess.setCount(3);
-				workActivityProcessService.insert(workActivityProcess);
-				workActivityProcessService.insertAuditsByType(rlzybzrList,processInstance.getId(),1,1);
-				workActivityProcessService.insertAuditsByType(fgldList,processInstance.getId(),2,0);
-				workActivityProcessService.insertAuditsByType(zjlList,processInstance.getId(),3,0);
+//				workActivityProcess.setCount(2);
+//				workActivityProcessService.insert(workActivityProcess);
+//				workActivityProcess.setCount(3);
+//				workActivityProcessService.insert(workActivityProcess);
+				workActivityProcessService.insertAuditsByType(rszrList,processInstance.getId(),1,1);
+//				workActivityProcessService.insertAuditsByType(fgldList,processInstance.getId(),2,0);
+//				workActivityProcessService.insertAuditsByType(zjlList,processInstance.getId(),3,0);
 			}
 			workChangeJob.setProcessInstanceId(processInstance.getId());
 			workChangeJob.setState("2");
@@ -366,7 +366,7 @@ public class WorkChangeJobService extends CrudService<WorkChangeJobDao, WorkChan
 		selectProcess.setProcessInstanceId(workChangeJob.getProcessInstanceId());
 		List<WorkActivityProcess> workActivityProcesses = workActivityProcessService.findList(selectProcess);
 		List<Activity> activities = workActivityMenu.getActivities();
-		if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("changeJob")) {
+		if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("rankAdjust")) {
 			key = 1;
 			for (int i = 0; i < workActivityProcesses.size(); i++) {
 				WorkActivityProcess activityProcess = workActivityProcesses.get(i);
@@ -411,7 +411,7 @@ public class WorkChangeJobService extends CrudService<WorkChangeJobDao, WorkChan
 				}
 			}
 		} else {
-			workActivityMenu.setProcessType("changeJob");
+			workActivityMenu.setProcessType("rankAdjust");
 			for (int i = 0; i < workActivityProcesses.size(); i++) {
 				WorkActivityProcess activityProcess = workActivityProcesses.get(i);
 				String count = activityProcess.getCount() + "";
@@ -420,42 +420,10 @@ public class WorkChangeJobService extends CrudService<WorkChangeJobDao, WorkChan
 					workActivityProcess.setId("");
 				}
 				// 审核环节
-				if ("bmzr".equals(taskDefKey) && count.contains("1")) {
+				 if ("bmzr".equals(taskDefKey) && count.contains("1")) {
 					taskCount = "1";
 					exp = "pass";
 					if ("yes".equals(flag)) {
-						workActivityProcessService.insertAuditsByType(auditUsers,workChangeJob.getProcessInstanceId(),2,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("2")) {
-					taskCount = "2";
-					exp = "pass";
-					if ("yes".equals(flag)) {
-						workActivityProcessService.insertAuditsByType(auditUsers,workChangeJob.getProcessInstanceId(),3,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("3")) {
-					taskCount = "3";
-					exp = "pass";
-					if ("yes".equals(flag)) {
 						notifyRole = "审批通过";
 						//修改职级
 						if(workChangeJob.getWorkChangeJobUserList()!=null&&workChangeJob.getWorkChangeJobUserList().size()>0){
@@ -477,7 +445,7 @@ public class WorkChangeJobService extends CrudService<WorkChangeJobDao, WorkChan
 					}
 					break;
 				}  else if ("modifyApply".equals(taskDefKey)&& count.contains("0")) {
-					notifyRole = "部门负责人审核";
+					notifyRole = "人事主任审核";
 					taskCount = "0";
 					exp = "pass";
 					workActivityProcess.setCount(0);
@@ -494,6 +462,7 @@ public class WorkChangeJobService extends CrudService<WorkChangeJobDao, WorkChan
 		workChangeJob.preUpdate();
 		// 提交流程任务
 		vars.put(exp, "yes".equals(flag) ? true : false);
+		vars.put("passs", true);
 		workActivityProcessService.updateProcess(workActivityProcess,workActivityMenu,key,taskCount,workChangeJob.getProcessInstanceId(),taskDefKey,"modifyApply",flag,comment, activities);
 		// 提交流程任务
 		actTaskService.complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
@@ -541,7 +510,7 @@ public class WorkChangeJobService extends CrudService<WorkChangeJobDao, WorkChan
 			}
 			workActivityProcessService.deleteProcessIdAuditUsers(workChangeJob.getProcessInstanceId());
 		} else {
-			if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("changeJob")) {
+			if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("rankAdjust")) {
 				WorkProjectNotify notify = new WorkProjectNotify();
 				notify.setNotifyId(workChangeJob.getId());
 				userList = workProjectNotifyService.readByNotifyId(notify);

+ 6 - 17
src/main/java/com/jeeplus/modules/workchangejob/web/WorkChangeJobController.java

@@ -290,33 +290,22 @@ public class WorkChangeJobController extends BaseController {
 	@RequestMapping(value = "saveAudit")
 	public String saveAudit(WorkChangeJob workChangeJob, Model model,
 							RedirectAttributes redirectAttributes) {
-		try {
+//		try {
 			// 对不同环节的业务逻辑进行操作
 			String taskDefKey = workChangeJob.getAct().getTaskDefKey();
 			List<User> users = null;
 			if ("bmzr".equals(taskDefKey)){
-				users = UserUtils.getByProssType(workChangeJob.getProcessInstanceId(),2);
-				if (users==null )
-					users = UserUtils.getByRoleActivityEnname("fgld",2,workChangeJob.getOfficeId(),"70",workChangeJob.getCreateBy());
-			}else  if ("fgld".equals(taskDefKey)){
-				users = UserUtils.getByProssType(workChangeJob.getProcessInstanceId(),3);
-				if (users==null )
-					users = UserUtils.getByRoleActivityEnname("zjl", 3, workChangeJob.getOfficeId(), "70", workChangeJob.getCreateBy());
-			}else  if ("zjl".equals(taskDefKey)){
 				users = UserUtils.getByProssType(workChangeJob.getProcessInstanceId(),3);
 			}else if ("modifyApply".equals(taskDefKey)){
 				users = UserUtils.getByProssType(workChangeJob.getProcessInstanceId(),1);
 			}
-			if (users==null || users.size()==0){
-				addMessage(redirectAttributes, "审批失败,审批人为空,请联系管理员!");
-			}else {
 				String str = workChangeJobService.auditSave(workChangeJob,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(workChangeJob.getHome()) && "home".equals(workChangeJob.getHome())) {
 			return "redirect:" + Global.getAdminPath() + "/home/?repage";
 		} else {

+ 6 - 0
src/main/java/com/jeeplus/modules/workstaff/dao/WorkStaffBasicInfoDao.java

@@ -43,4 +43,10 @@ public interface WorkStaffBasicInfoDao extends CrudDao<WorkStaffBasicInfo> {
     void updateStatus(@Param("id") String id, @Param("status") String status);
 
     int deleteByLogic(WorkStaffBasicInfo workStaffBasicInfo);
+
+    List<WorkStaffBasicInfo> findByMob(String mobile);
+
+    WorkStaffBasicInfo findByCard(String cardNo);
+
+    List<WorkStaffBasicInfo> findByName(String name);
 }

+ 8 - 0
src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffBasicInfoService.java

@@ -124,6 +124,14 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
 	public List<WorkStaffBasicInfo> getByCompanyInfo(WorkStaffBasicInfo workStaffBasicInfo) {
         return workStaffAchivesDao.getByCompanyInfo(workStaffBasicInfo);
     }
+
+    public List<WorkStaffBasicInfo> findByMob(String mobile) {
+        return workStaffBasicInfoDao.findByMob(mobile);
+    }
+
+    public List<WorkStaffBasicInfo> findByName(String name) {
+        return workStaffBasicInfoDao.findByName(name);
+    }
     public WorkStaffBasicInfo getByUserOffice(WorkStaffBasicInfo workStaffBasicInfo) {
         return workStaffAchivesDao.getByUserOffice(workStaffBasicInfo);
     }

+ 27 - 4
src/main/java/com/jeeplus/modules/workstaff/web/WorkStaffBasicInfoController.java

@@ -3,12 +3,11 @@
  */
 package com.jeeplus.modules.workstaff.web;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -602,4 +601,28 @@ public class WorkStaffBasicInfoController extends BaseController {
         model.addAttribute("modular", "人员档案");
         return "modules/sysimportinfo/sysimportinfoList";
     }
+
+	/**
+	 * 手机号验证
+	 */
+	@ResponseBody
+	@RequestMapping(value = "checkMobile")
+	public String checkMoblie(String mobile) {
+		List<WorkStaffBasicInfo> workStaffBasicInfos = workStaffBasicInfoService.findByMob(mobile);
+		if(workStaffBasicInfos != null && workStaffBasicInfos.size()>0){
+			return "false";
+		}
+		return "true";
+	}
+
+	/**
+	 * 重名跳转
+	 */
+	@RequestMapping(value = "repeatName")
+	public String repeatName(String name,Model model) throws UnsupportedEncodingException {
+		String name1 = URLDecoder.decode(name, "utf8");
+		List<WorkStaffBasicInfo> list = workStaffBasicInfoService.findByName(name1);
+		model.addAttribute("list",list);
+		return "modules/workstaff/infoList";
+	}
 }

+ 5 - 4
src/main/resources/jeeplus.properties

@@ -7,6 +7,7 @@ jdbc.type=mysql
 jdbc.driver=com.mysql.jdbc.Driver
 db.name=ruihuaoa-activity-data
 jdbc.url=jdbc:mysql://192.168.2.4:3306/total_process_master?useUnicode=true&characterEncoding=utf-8
+#jdbc.url=jdbc:mysql://127.0.0.1:3306/total_process_master?useUnicode=true&characterEncoding=utf-8
 jdbc.username=root
 jdbc.password=root
 
@@ -32,10 +33,10 @@ slave.jdbc.password=root
 
 #redis settings
 redis.keyPrefix=jeeplus
-redis.host=192.168.2.4
-#redis.host=127.0.0.1
-redis.port=6380
-#redis.port=6379
+#redis.host=192.168.2.4
+redis.host=127.0.0.1
+#redis.port=6380
+redis.port=6379
 
 #============================#
 #===== System settings ======#

+ 24 - 0
src/main/resources/mappings/modules/workstaff/WorkStaffBasicInfoDao.xml

@@ -479,4 +479,28 @@
 		status = #{status}
 		where user_id = #{id}
 	</update>
+
+	<select id="findByMob" parameterType="String" resultType="WorkStaffBasicInfo">
+		select a.id
+		from work_staff_basic_info a
+		<where>
+			a.mobile=#{mobile}
+		</where>
+	</select>
+
+	<select id="findByCard" parameterType="String" resultType="WorkStaffBasicInfo">
+		select a.mobile
+		from work_staff_basic_info a
+		<where>
+			id_card = #{cardNo}
+		</where>
+	</select>
+
+	<select id="findByName" parameterType="String" resultType="WorkStaffBasicInfo">
+		select a.name, a.id_card AS "idCard"
+		from work_staff_basic_info a
+		<where>
+			name = #{name}
+		</where>
+	</select>
 </mapper>

+ 2 - 0
src/main/resources/spring-context-shiro.xml

@@ -31,6 +31,8 @@
                 ${adminPath}/sys/register/getRegisterCode = anon
                 ${adminPath}/sys/register/validateMobileCode = anon
                 ${adminPath}/sys/register/validatePassword = anon
+                ${adminPath}/workstaff/workStaffBasicInfo/repeatName = anon
+                ${adminPath}/sys/register/users = anon
                 ${adminPath}/login/getRandomCode = anon
                 ${adminPath}/soft/sysVersion/getAndroidVer = anon
                 ${adminPath}/soft/sysVersion/getIosVer = anon

Dosya farkı çok büyük olduğundan ihmal edildi
+ 2 - 0
src/main/webapp/static/layui/css/layui.css


Dosya farkı çok büyük olduğundan ihmal edildi
+ 2 - 0
src/main/webapp/static/layui/css/layui.mobile.css


Dosya farkı çok büyük olduğundan ihmal edildi
+ 2 - 0
src/main/webapp/static/layui/css/modules/code.css


Dosya farkı çok büyük olduğundan ihmal edildi
+ 2 - 0
src/main/webapp/static/layui/css/modules/laydate/default/laydate.css


BIN
src/main/webapp/static/layui/css/modules/layer/default/icon-ext.png


BIN
src/main/webapp/static/layui/css/modules/layer/default/icon.png


Dosya farkı çok büyük olduğundan ihmal edildi
+ 2 - 0
src/main/webapp/static/layui/css/modules/layer/default/layer.css


BIN
src/main/webapp/static/layui/css/modules/layer/default/loading-0.gif


BIN
src/main/webapp/static/layui/css/modules/layer/default/loading-1.gif


BIN
src/main/webapp/static/layui/css/modules/layer/default/loading-2.gif


BIN
src/main/webapp/static/layui/font/iconfont.eot


Dosya farkı çok büyük olduğundan ihmal edildi
+ 485 - 0
src/main/webapp/static/layui/font/iconfont.svg


BIN
src/main/webapp/static/layui/font/iconfont.ttf


BIN
src/main/webapp/static/layui/font/iconfont.woff


BIN
src/main/webapp/static/layui/font/iconfont.woff2


BIN
src/main/webapp/static/layui/images/face/0.gif


BIN
src/main/webapp/static/layui/images/face/1.gif


BIN
src/main/webapp/static/layui/images/face/10.gif


BIN
src/main/webapp/static/layui/images/face/11.gif


BIN
src/main/webapp/static/layui/images/face/12.gif


BIN
src/main/webapp/static/layui/images/face/13.gif


BIN
src/main/webapp/static/layui/images/face/14.gif


BIN
src/main/webapp/static/layui/images/face/15.gif


BIN
src/main/webapp/static/layui/images/face/16.gif


BIN
src/main/webapp/static/layui/images/face/17.gif


BIN
src/main/webapp/static/layui/images/face/18.gif


BIN
src/main/webapp/static/layui/images/face/19.gif


BIN
src/main/webapp/static/layui/images/face/2.gif


BIN
src/main/webapp/static/layui/images/face/20.gif


BIN
src/main/webapp/static/layui/images/face/21.gif


BIN
src/main/webapp/static/layui/images/face/22.gif


BIN
src/main/webapp/static/layui/images/face/23.gif


BIN
src/main/webapp/static/layui/images/face/24.gif


BIN
src/main/webapp/static/layui/images/face/25.gif


BIN
src/main/webapp/static/layui/images/face/26.gif


BIN
src/main/webapp/static/layui/images/face/27.gif


BIN
src/main/webapp/static/layui/images/face/28.gif


BIN
src/main/webapp/static/layui/images/face/29.gif


BIN
src/main/webapp/static/layui/images/face/3.gif


BIN
src/main/webapp/static/layui/images/face/30.gif


BIN
src/main/webapp/static/layui/images/face/31.gif


BIN
src/main/webapp/static/layui/images/face/32.gif


BIN
src/main/webapp/static/layui/images/face/33.gif


BIN
src/main/webapp/static/layui/images/face/34.gif


BIN
src/main/webapp/static/layui/images/face/35.gif


BIN
src/main/webapp/static/layui/images/face/36.gif


BIN
src/main/webapp/static/layui/images/face/37.gif


BIN
src/main/webapp/static/layui/images/face/38.gif


BIN
src/main/webapp/static/layui/images/face/39.gif


BIN
src/main/webapp/static/layui/images/face/4.gif


BIN
src/main/webapp/static/layui/images/face/40.gif


BIN
src/main/webapp/static/layui/images/face/41.gif


BIN
src/main/webapp/static/layui/images/face/42.gif


BIN
src/main/webapp/static/layui/images/face/43.gif


BIN
src/main/webapp/static/layui/images/face/44.gif


BIN
src/main/webapp/static/layui/images/face/45.gif


BIN
src/main/webapp/static/layui/images/face/46.gif


BIN
src/main/webapp/static/layui/images/face/47.gif


BIN
src/main/webapp/static/layui/images/face/48.gif


BIN
src/main/webapp/static/layui/images/face/49.gif


BIN
src/main/webapp/static/layui/images/face/5.gif


BIN
src/main/webapp/static/layui/images/face/50.gif


BIN
src/main/webapp/static/layui/images/face/51.gif


BIN
src/main/webapp/static/layui/images/face/52.gif


BIN
src/main/webapp/static/layui/images/face/53.gif


BIN
src/main/webapp/static/layui/images/face/54.gif


BIN
src/main/webapp/static/layui/images/face/55.gif


BIN
src/main/webapp/static/layui/images/face/56.gif


BIN
src/main/webapp/static/layui/images/face/57.gif


BIN
src/main/webapp/static/layui/images/face/58.gif


BIN
src/main/webapp/static/layui/images/face/59.gif


BIN
src/main/webapp/static/layui/images/face/6.gif


BIN
src/main/webapp/static/layui/images/face/60.gif


BIN
src/main/webapp/static/layui/images/face/61.gif


BIN
src/main/webapp/static/layui/images/face/62.gif


BIN
src/main/webapp/static/layui/images/face/63.gif


BIN
src/main/webapp/static/layui/images/face/64.gif


BIN
src/main/webapp/static/layui/images/face/65.gif


BIN
src/main/webapp/static/layui/images/face/66.gif


BIN
src/main/webapp/static/layui/images/face/67.gif


BIN
src/main/webapp/static/layui/images/face/68.gif


BIN
src/main/webapp/static/layui/images/face/69.gif


BIN
src/main/webapp/static/layui/images/face/7.gif


BIN
src/main/webapp/static/layui/images/face/70.gif


BIN
src/main/webapp/static/layui/images/face/71.gif


BIN
src/main/webapp/static/layui/images/face/8.gif


BIN
src/main/webapp/static/layui/images/face/9.gif


+ 0 - 0
src/main/webapp/static/layui/lay/modules/carousel.js


Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor