岗位修改

src/main/java/com/jeeplus/modules/sys/service/UserService.java

@@ -237,14 +237,14 @@ public class UserService extends BaseController {
             UserUtils.putCache("selectOffice", user.getOffice().getId());
         }
         if (!loginUser.getComId().equals("1")){
-            Role comRole =  systemService.getRoleByEnname(loginUser.getCompany().getId(), user.getOffice(),"yg");
-            if (comRole != null && !comRole.getCompany().getId().equals("1")){
+//            Role comRole =  systemService.getRoleByEnname(loginUser.getCompany().getId(), user.getOffice(),"yg");
+//            if (comRole != null && !comRole.getCompany().getId().equals("1")){
                 Useroffice useroffice = new Useroffice();
                 useroffice.setUserId(user.getId());
                 useroffice.setStatus("3");
                 useroffice.setMaster(UserUtils.getUser().getId());
                 useroffice.setCompanyId(loginUser.getCompany().getId());
-                useroffice.setOfficeId(comRole.getOffice().getId());
+                useroffice.setOfficeId(user.getOffice().getId());
                 List<Useroffice> listOffice = userofficeService.findList(useroffice);
                 if(listOffice==null || listOffice.size()==0){
                     userofficeService.save(useroffice);
@@ -253,10 +253,10 @@ public class UserService extends BaseController {
                     oldUseroffice.setOfficeId(user.getOffice().getId());
                     userofficeService.save(oldUseroffice);
                 }
-            }
-            if (b) {
-                systemService.assignUserToRole(comRole, user,0);
-            }
+//            }
+//            if (b) {
+//                systemService.assignUserToRole(comRole, user,0);
+//            }
         }else {
             systemService.addUserToRole(user);
         }

src/main/java/com/jeeplus/modules/workofficechange/service/WorkOfficeChangeService.java

@@ -770,30 +770,32 @@ public class WorkOfficeChangeService extends CrudService<WorkOfficeChangeDao, Wo
 						useroffice.setCompanyId(workStaffBasicInfo.getCompany().getId());
 						useroffice.setOfficeId(workOfficeChange.getChangeOffice());
 						Useroffice useroffice1=userofficeDao.findOfficeId(useroffice);
-						if(useroffice1.getOfficeId().equals(user.getOffice().getId())){
-							user.setId(workOfficeChangeUser.getUserId());
-							user.setOffice(office);
-							userDao.update(user);
+						if(useroffice1 != null) {
+							if (useroffice1.getOfficeId().equals(user.getOffice().getId())) {
+								user.setId(workOfficeChangeUser.getUserId());
+								user.setOffice(office);
+								userDao.update(user);
+							}
 						}
 						userofficeDao.updateOffice(useroffice);
 						//在新部门增加默认岗位
-						Role r=new Role();
-						r.setOffice(office);
-						r.setName("员工");
-						r.setEnname("yg");
-						List<Role> list=new ArrayList<>();
-						Role role=roleDao.getRoleByOfficeId(r);
-						if(role!=null){
-							list.add(role);
-							User uu=new User();
-							uu.setId(workOfficeChangeUser.getUserId());
-							uu.setRoleList(list);
-							//查询是否存在员工岗位
-							List userRole=userDao.findUserRole(workOfficeChangeUser.getUserId(),role.getId());
-							if(userRole==null||list.size() ==0 ){
-								userDao.insertUserRole(uu);
-							}
-						}
+//						Role r=new Role();
+//						r.setOffice(office);
+//						r.setName("员工");
+//						r.setEnname("yg");
+//						List<Role> list=new ArrayList<>();
+//						Role role=roleDao.getRoleByOfficeId(r);
+//						if(role!=null){
+//							list.add(role);
+//							User uu=new User();
+//							uu.setId(workOfficeChangeUser.getUserId());
+//							uu.setRoleList(list);
+//							//查询是否存在员工岗位
+//							List userRole=userDao.findUserRole(workOfficeChangeUser.getUserId(),role.getId());
+//							if(userRole==null||list.size() ==0 ){
+//								userDao.insertUserRole(uu);
+//							}
+//						}
 
 					}
 					//修改入职登记表office

src/main/webapp/webpage/modules/sys/sysLogin.jsp

@@ -933,7 +933,8 @@
 				area: ['40%', '40%'],
 				title: '选择用户',
 				maxmin: true, //开启最大化最小化按钮
-				content: '${ctx}/workstaff/workStaffBasicInfo/repeatName?name='+encodeURI(encodeURI(name))
+				content: '${ctx}/workstaff/workStaffBasicInfo/repeatName?name='+encodeURI(encodeURI(name)),
+				// btn: ['关闭'],
 			});
 		}
 

src/main/webapp/webpage/modules/workstaff/infoList.jsp

@@ -17,12 +17,6 @@
         $(document).ready(function() {
 
         });
-
-
-
-        function setParentInfo(ids,names,nos,salarys){
-            return;
-        }
 	</script>
 </head>
 <body>
@@ -44,7 +38,9 @@
                 <%--<table:page page="${page}"></table:page>--%>
                 <%--<div style="clear: both;"></div>--%>
             </div>
+            <a href="javascript:window.opener=null;window.open('','_self');window.close();">关闭</a>
         </div>
+
     </div>
     <div id="changewidth"></div>
 </div>