feat： 调整客户供应商分配、转移功能，优化效率

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

@@ -343,17 +343,17 @@ public class UserController {
 
 	/**
 	 * 将客户权限转移给用户(管理员操作)
-	 * @param custUU
+	 * @param id
 	 * @param json
 	 * @return
 	 */
-	@RequestMapping(value = "/transferUserToVendor/{uu}", method = RequestMethod.POST)
+	@RequestMapping(value = "/transferUserToVendor/{id}", method = RequestMethod.POST)
 	@ResponseBody
-	public ResponseEntity<String> transferUserToVendor(@PathVariable("uu") Long custUU, @RequestBody String json) {
+	public ResponseEntity<String> transferUserToVendor(@PathVariable("id") Long id, @RequestBody String json) {
 		List<UserBaseInfo> users = FlexJsonUtils.fromJsonArray(json, UserBaseInfo.class);
-		boolean result = userService.transferUserToVendor(custUU, users);
+		boolean result = userService.transferUserToVendor(id, users);
         String resultInfo = result ? "成功" : "失败";
-        LOGGER.log("客户分配", "将客户权限转移给用户", "客户UU： " + custUU + "结果： 绑定" + resultInfo);
+        LOGGER.log("客户分配", "将客户权限转移给用户", "客户UU： " + id + "结果： 绑定" + resultInfo);
         return new ResponseEntity<>(result ? HttpStatus.OK : HttpStatus.INTERNAL_SERVER_ERROR);
 	}
 
@@ -432,10 +432,10 @@ public class UserController {
      *
      * @return
      */
-    @RequestMapping(value = "/getDistribute/{custUU}", method = RequestMethod.GET)
+    @RequestMapping(value = "/getDistribute/{id}", method = RequestMethod.GET)
     @ResponseBody
-    public ModelMap getDistribute(@PathVariable("custUU") Long custUU) {
-        Boolean result = userService.getDistribute(custUU);
+    public ModelMap getDistribute(@PathVariable("id") Long id) {
+        Boolean result = userService.getDistribute(id);
 		ModelMap modelMap = new ModelMap();
 		modelMap.put("result", result);
 		return  modelMap;

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

@@ -278,11 +278,11 @@ public interface UserService {
 
 	/**
 	 * 将客户权限转移给用户(管理员操作)
-	 * @param custUU
+	 * @param id
 	 * @param users
 	 * @return
 	 */
-	boolean transferUserToVendor(Long custUU, List<UserBaseInfo> users);
+	boolean transferUserToVendor(Long id, List<UserBaseInfo> users);
 
 	/**
 	 * 将客户权限转移给用户（有权限的用户操作）
@@ -316,10 +316,10 @@ public interface UserService {
     Boolean getEnTransfer(Long custUU);
 	/**
 	 * 当前登录用户，是否被分配当前客户权限
-	 * @param custUU
+	 * @param id
 	 * @return
 	 */
-	Boolean getDistribute(Long custUU);
+	Boolean getDistribute(Long id);
 
 
 	User updateUserRole(User user);

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

@@ -651,9 +651,9 @@ public class UserServiceImpl implements UserService {
 	}
 
 	@Override
-	public Boolean getDistribute(Long custUU) {
-		List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(custUU, SystemSession.getUser().getEnterprise().getUu());
-		List<Distribute> distributes = distributeDao.findByUserUUAndVendorId(SystemSession.getUser().getUserUU(), vendors.get(0).getId());
+	public Boolean getDistribute(Long id) {
+		Vendor vendor = vendorDao.findOne(id);
+		List<Distribute> distributes = distributeDao.findByUserUUAndVendorId(SystemSession.getUser().getUserUU(), vendor.getId());
 		// 被分配了权限
 		if (!CollectionUtils.isEmpty(distributes)) {
 			return true;
@@ -914,11 +914,10 @@ public class UserServiceImpl implements UserService {
     }
 
 	@Override
-	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);
+	public boolean transferUserToVendor(Long id, List<UserBaseInfo> users) {
+		if (!CollectionUtils.isEmpty(users)) {
 			// 被转移人UU，用于修改转移人下属权限的leaderUU
+            Vendor vendor = vendorDao.findOne(id);
 			Long userUU = null;
 			for (UserBaseInfo u : users) {
 				Distribute distribute = new Distribute();

src/main/webapp/resources/js/common/services.js

@@ -385,7 +385,7 @@ define(['angular', 'toaster', 'big'], function(angular, big) {
                 method: 'POST'
             },
             transferUserToVendor: {
-                url: 'account/user/transferUserToVendor/:uu',
+                url: 'account/user/transferUserToVendor/:id',
                 method: 'POST'
             },
             transferMyDistribute: {
@@ -398,7 +398,7 @@ define(['angular', 'toaster', 'big'], function(angular, big) {
                 isArray: true
             },
             getDistribute: {
-                url: 'account/user/getDistribute/:custUU',
+                url: 'account/user/getDistribute/:id',
                 method: 'GET'
             },
             getEnTransfer: {

src/main/webapp/resources/js/index/app.js

@@ -2187,7 +2187,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             //     return;
             // }
             // 获取当前用户在当前企业是否被转移权限
-            AccountUser.getDistribute ({custUU: customer.myEnterprise.uu}, function(data) {
+            AccountUser.getDistribute ({id: customer.id}, function(data) {
                 customer.enDistribute = data.result;
                 //是管理员，或者被分配时
                 if ($scope.enabled || customer.enDistribute) {