客户分配优化调整

src/main/java/com/uas/platform/b2b/controller/UserController.java

@@ -334,7 +334,7 @@ public class UserController {
 	@RequestMapping(value = "/bindUserToVendor/{uu}", method = RequestMethod.POST)
 	@ResponseBody
 	public ResponseEntity<String> bindUserToVendor(@PathVariable("uu") Long custUU, @RequestBody String json) {
-		List<User> users = FlexJsonUtils.fromJsonArray(json, User.class);
+		List<UserBaseInfo> users = FlexJsonUtils.fromJsonArray(json, UserBaseInfo.class);
 		boolean result = userService.addUserToVendor(custUU, users);
         String resultInfo = result ? "成功" : "失败";
         LOGGER.log("客户分配", "绑定用户到指定客户", "客户UU： " + custUU + "结果： 绑定" + resultInfo);
@@ -354,7 +354,7 @@ public class UserController {
 	@RequestMapping(value = "/transferUserToVendor/{uu}", method = RequestMethod.POST)
 	@ResponseBody
 	public ResponseEntity<String> transferUserToVendor(@PathVariable("uu") Long custUU, @RequestBody String json) {
-		List<User> users = FlexJsonUtils.fromJsonArray(json, User.class);
+		List<UserBaseInfo> users = FlexJsonUtils.fromJsonArray(json, UserBaseInfo.class);
 		boolean result = userService.transferUserToVendor(custUU, users);
         String resultInfo = result ? "成功" : "失败";
         LOGGER.log("客户分配", "将客户权限转移给用户", "客户UU： " + custUU + "结果： 绑定" + resultInfo);

src/main/java/com/uas/platform/b2b/service/UserService.java

@@ -273,7 +273,7 @@ public interface UserService {
 	 * @param users
 	 * @return
 	 */
-    boolean addUserToVendor(Long custUU, List<User> users);
+    boolean addUserToVendor(Long custUU, List<UserBaseInfo> users);
 
 	/**
 	 * 将客户权限转移给用户(管理员操作)
@@ -281,7 +281,7 @@ public interface UserService {
 	 * @param users
 	 * @return
 	 */
-	boolean transferUserToVendor(Long custUU, List<User> users);
+	boolean transferUserToVendor(Long custUU, List<UserBaseInfo> users);
 
 	/**
 	 * 将客户权限转移给用户（有权限的用户操作）

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

@@ -853,16 +853,16 @@ public class UserServiceImpl implements UserService {
 	}
 
 	@Override
-	public boolean addUserToVendor(Long custUU, List<User> users) {
+	public boolean addUserToVendor(Long custUU, List<UserBaseInfo> users) {
 		List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(custUU, SystemSession.getUser().getEnterprise().getUu());
 		if (!CollectionUtils.isEmpty(users)) {
 		    List<Distribute> saveList = new ArrayList<>();
-			for (User u : users) {
+			for (UserBaseInfo u : users) {
 				List<Distribute> deleteList = new ArrayList<>();
 				if (null != u.getUserUU()) {
                     Distribute distribute = new Distribute();
                     List<Distribute> butes = distributeDao.findByUserUUAndVendorId(u.getUserUU(), vendors.get(0).getId());
-                    if (u.getDistribute()) {
+                    if (u.isDistribute()) {
                         if (CollectionUtils.isEmpty(butes)) {
                             distribute.setUserUU(u.getUserUU());
                             distribute.setVendorId(vendors.get(0).getId());
@@ -914,16 +914,16 @@ public class UserServiceImpl implements UserService {
     }
 
 	@Override
-	public boolean transferUserToVendor(Long custUU, List<User> users) {
+	public boolean transferUserToVendor(Long custUU, List<UserBaseInfo> users) {
 		List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(custUU, SystemSession.getUser().getEnterprise().getUu());
 		if (!CollectionUtils.isEmpty(vendors) && !CollectionUtils.isEmpty(users)) {
 			Vendor vendor = vendors.get(0);
 			// 被转移人UU，用于修改转移人下属权限的leaderUU
 			Long userUU = null;
-			for (User u : users) {
+			for (UserBaseInfo u : users) {
 				Distribute distribute = new Distribute();
 				List<Distribute> transfers = distributeDao.findByUserUUAndVendorId(u.getUserUU(), vendor.getId());
-				if (u.getTransfer()) {
+				if (u.isTransfer()) {
 					if (CollectionUtils.isEmpty(transfers)) {
 						distribute.setUserUU(u.getUserUU());
 						distribute.setVendorId(vendor.getId());