zouxuan 5 年之前
父节点
当前提交
9b817c547c

+ 3 - 1
edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/EmployeeServiceImpl.java

@@ -58,7 +58,9 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 				employeeDao.insert(employee);
 				//新增用户角色
 				sysUserDao.batchAddEmployeeRole(user.getId(),sysUser.getRoles());
-				user.setUserType(user.getUserType() + ",SYSTEM");
+				if(!user.getUserType().contains("SYSTEM")){
+					user.setUserType(user.getUserType() + ",SYSTEM");
+				}
 				sysUserDao.update(user);
 			}else if(employee1.getDelFlag()){
 				employee1.setDelFlag(false);

+ 4 - 2
edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/OrganizationServiceImpl.java

@@ -80,7 +80,9 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 				if(sysUser.getRoles() != null && sysUser.getRoles().size() > 0){
 					sysUserDao.batchAddEmployeeRole(user.getId(),sysUser.getRoles());
 				}
-				user.setUserType(user.getUserType() + ",ORGAN");
+				if(!user.getUserType().contains("SYSTEM")){
+					user.setUserType(user.getUserType() + ",SYSTEM");
+				}
 				user.setRealName(organ.getName());
 				user.setPhone(organ.getContactPhone());
 				sysUserDao.update(user);
@@ -93,7 +95,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 			return;
 		}
 		sysUser.setPassword(new BCryptPasswordEncoder().encode("123456"));
-		sysUser.setUserType("ORGAN");
+		sysUser.setUserType("SYSTEM");
 		sysUser.setRealName(organ.getName());
 		sysUser.setPhone(organ.getContactPhone());
 		sysUserDao.insert(sysUser);