权限调整

src/main/java/com/uas/platform/b2b/service/impl/UserServiceImpl.java

@@ -1,11 +1,7 @@
 package com.uas.platform.b2b.service.impl;
 
 import com.uas.message.mail.service.MailService;
-import com.uas.platform.b2b.dao.CommonDao;
-import com.uas.platform.b2b.dao.DistributeDao;
-import com.uas.platform.b2b.dao.EnterpriseDao;
-import com.uas.platform.b2b.dao.UserDao;
-import com.uas.platform.b2b.dao.VendorDao;
+import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.model.Distribute;
 import com.uas.platform.b2b.model.Enterprise;
 import com.uas.platform.b2b.model.Role;
@@ -63,6 +59,8 @@ public class UserServiceImpl implements UserService {
 	@Autowired
 	private UserDao userDao;
 	@Autowired
+	private RoleDao roleDao;
+	@Autowired
 	private VendorDao vendorDao;
 	@Autowired
 	private DistributeDao distributeDao;
@@ -424,6 +422,14 @@ public class UserServiceImpl implements UserService {
 		try {
 			Long userUU = addUserToAccountCenter(user);
 			user.setUserUU(userUU);
+			List<Role> roles = roleDao.findByEnUUAndDesc(SystemSession.getUser().getEnterprise().getUu(), "普通用户");
+			if (!CollectionUtils.isEmpty(roles)) {
+				Set<Role> set = new HashSet<>();
+				set.add(roles.get(0));
+				user.setRoles(set);
+			} else {
+				enterpriseDao.callInitProcedure(SystemSession.getUser().getEnterprise().getUu());
+			}
             user.addEnterprise(SystemSession.getUser().getEnterprise());
             user.setCurrentEnterprise();
 			userDao.save(user);
@@ -708,12 +714,19 @@ public class UserServiceImpl implements UserService {
 		if (user == null) {
 			throw new IllegalArgumentException("不存在的用户！");
 		}
-
 		Set<Enterprise> enterprises = user.getEnterprises();
 		if (CollectionUtils.isEmpty(enterprises)) {
 			enterprises = new HashSet<Enterprise>();
 		}
 		enterprises.add(SystemSession.getUser().getEnterprise());
+		List<Role> roles = roleDao.findByEnUUAndDesc(SystemSession.getUser().getEnterprise().getUu(), "普通用户");
+		if (roles.size() > 0) {
+			Set<Role> set = user.getRoles();
+			set.add(roles.get(0));
+			user.setRoles(set);
+		} else {
+			enterpriseDao.callInitProcedure((SystemSession.getUser().getEnterprise().getUu()));
+		}
 		user.setEnterprises(enterprises);
 		userDao.save(user);
 		try {

src/main/java/com/uas/platform/b2b/v2/service/impl/UserServiceImpl.java

@@ -1,20 +1,22 @@
 package com.uas.platform.b2b.v2.service.impl;
 
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.User;
-import com.uas.sso.entity.UserView;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.RoleDao;
 import com.uas.platform.b2b.dao.UserDao;
+import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.model.Role;
+import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.v2.service.UserService;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.util.encry.Md5Utils;
+import com.uas.sso.entity.UserView;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import java.util.HashSet;
-import org.springframework.util.StringUtils;
+import java.util.List;
+import java.util.Set;
 
 @Service("v2.UserService")
 public class UserServiceImpl implements UserService {
@@ -81,6 +83,14 @@ public class UserServiceImpl implements UserService {
 		if (user == null || enterprise == null) {
 			return;
 		}
+		List<Role> roles = roleDao.findByEnUUAndDesc(enterprise.getUu(), "普通用户");
+		if (roles.size() > 0) {
+			Set<Role> set = user.getRoles();
+			set.add(roles.get(0));
+			user.setRoles(set);
+		} else {
+			enterpriseDao.callInitProcedure(enterprise.getUu());
+		}
 		user.getEnterprises().add(enterprise);
 		userDao.save(user);
 	}