|
|
@@ -831,9 +831,9 @@ public class UserServiceImpl implements UserService {
|
|
|
List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(custUU, SystemSession.getUser().getEnterprise().getUu());
|
|
|
if (!CollectionUtils.isEmpty(users)) {
|
|
|
List<Distribute> saveList = new ArrayList<>();
|
|
|
- List<Distribute> deleteList = new ArrayList<>();
|
|
|
for (User u : users) {
|
|
|
- if (null != u.getUserUU()) {
|
|
|
+ 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()) {
|
|
|
@@ -850,7 +850,9 @@ public class UserServiceImpl implements UserService {
|
|
|
deleteList.add(butes.get(0));
|
|
|
Long vendorId = vendors.get(0).getId();
|
|
|
Long userUU = u.getUserUU();
|
|
|
- deleteList = deleteChildrenDistributes(vendorId, userUU, deleteList);
|
|
|
+ if (null != butes.get(0).getIsTransfer() && 1 == butes.get(0).getIsTransfer()) {
|
|
|
+ deleteList = deleteChildrenDistributes(vendorId, userUU, deleteList);
|
|
|
+ }
|
|
|
// 防止出现作为参数的用户之间存在权限父子节点关系，导致重复查询，所以每次递归完成，执行一次删除
|
|
|
distributeDao.delete(deleteList);
|
|
|
}
|
dongbw