Просмотр исходного кода

增加物料替代关系是否可编辑字段

suntg 8 лет назад
Родитель
Сommit
54fddf2030

+ 19 - 0
src/main/java/com/uas/platform/b2c/prod/commodity/model/ProductReplace.java

@@ -1,7 +1,12 @@
 package com.uas.platform.b2c.prod.commodity.model;
 
+import com.uas.platform.b2c.common.account.model.Role;
+import com.uas.platform.b2c.core.support.SystemSession;
+import org.apache.commons.collections.CollectionUtils;
+
 import javax.persistence.*;
 import java.util.Date;
+import java.util.Set;
 
 /**
  * 存贮商城替代物料
@@ -165,4 +170,18 @@ public class ProductReplace {
     public void setDetno(Short detno) {
         this.detno = detno;
     }
+
+    /**
+     * 判断替代关系当前用户是否可编辑
+     * @return
+     */
+    public boolean isEditable() {
+        if (SystemSession.getUser().isSys()) {
+            return true;
+        }
+        if (SystemSession.getUser().getUserUU().equals(this.userUU)) {
+            return true;
+        }
+        return false;
+    }
 }

+ 6 - 2
src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductServiceImpl.java

@@ -386,8 +386,12 @@ public class ProductServiceImpl implements ProductService {
         List<ProductReplace> productReplacesOld = productReplaceDao.findByUserUUAndProductId(SystemSession.getUser().getUserUU(), productId);
         productReplaceDao.delete(productReplacesOld);
         for (ProductReplace productReplace : productReplaceList) {
-            productReplace.setUserUU(SystemSession.getUser().getUserUU());
-            productReplace.setTime(date);
+            if (productReplace.getUserUU() == null) {
+                productReplace.setUserUU(SystemSession.getUser().getUserUU());
+            }
+            if (productReplace.getTime() == null) {
+                productReplace.setTime(date);
+            }
         }
         productReplaceDao.save(productReplaceList);
         return true;