|
|
@@ -1027,15 +1027,10 @@ public class ProductServiceImpl implements ProductService {
|
|
|
boolean isExist = false;
|
|
|
ProductUsers productUsers1 = null;
|
|
|
Long enuu = null;
|
|
|
- for (int i = productIds.size() - 1; (i >= 0) && (enuu == null); i--) {
|
|
|
- Product product = productDao.findOne(productIds.get(i));
|
|
|
- if (product != null) {
|
|
|
- enuu = product.getEnUU();
|
|
|
- }
|
|
|
- }
|
|
|
+ List<Product> products = productDao.findByIdList(productIds);
|
|
|
List<ProductUsers> list = new ArrayList<>();
|
|
|
List<ProductUsers> productUsers = productUsersDao.findByUseruuAndPrids(userUU, productIds);
|
|
|
- for (Long productId : productIds) {
|
|
|
+ for (final Long productId : productIds) {
|
|
|
isExist = false;
|
|
|
for (ProductUsers productUser : productUsers) {
|
|
|
if ((productId != null && productUser.getPrid() != null) && (productUser.getPrid().longValue() == productId.longValue())) {
|
|
|
@@ -1047,7 +1042,12 @@ public class ProductServiceImpl implements ProductService {
|
|
|
productUsers1 = new ProductUsers();
|
|
|
productUsers1.setUseruu(userUU);
|
|
|
productUsers1.setEnuu(enuu);
|
|
|
- productUsers1.setPrid(productId);
|
|
|
+ for (Product product : products) {
|
|
|
+ if (product.getId().equals(productId)) {
|
|
|
+ productUsers1.setProduct(product);
|
|
|
+ productUsers1.setPrid(productId);
|
|
|
+ }
|
|
|
+ }
|
|
|
productUsers1.setDate(new Date(System.currentTimeMillis()));
|
|
|
list.add(productUsers1);
|
|
|
}
|
|
|
@@ -1062,7 +1062,7 @@ public class ProductServiceImpl implements ProductService {
|
|
|
@Override
|
|
|
public ModelMap disAssignPersonalProduct(Long userUU, Long productId) {
|
|
|
ModelMap map = new ModelMap();
|
|
|
- List<ProductUsers> productUsers = productUsersDao.findByUseruuAndPrid(userUU,productId);
|
|
|
+ List<ProductUsers> productUsers = productUsersDao.findByUseruuAndPrid(userUU, productId);
|
|
|
if (productUsers != null) {
|
|
|
productUsersDao.delete(productUsers);
|
|
|
}
|