‘linchangsheng’ 5 kuukautta sitten
vanhempi
commit
0c02e5c39c

+ 3 - 0
mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/PolicyOrderLogic.java

@@ -23,6 +23,7 @@ import com.gree.mall.manager.zfire.util.FieldUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.remoting.RemoteAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.rmi.RemoteException;
@@ -142,6 +143,7 @@ public class PolicyOrderLogic {
         }
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public void importData(List<Object> objects) {
 
         for (Object o : objects) {
@@ -216,6 +218,7 @@ public class PolicyOrderLogic {
         }
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public void importEm(List<Object> objects) {
 
         for (Object o : objects) {

+ 0 - 3
mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -100,9 +100,6 @@
             </foreach>
         </if>
         and a.apply_type='WORKER'
-        <if test="isOK != null and isOK == true">
-            AND a.worker_number IS NOT NULL
-        </if>
         <if test="ex.isGroupByWorkerId != null and ex.isGroupByWorkerId == true">
             GROUP BY a.worker_number
         </if>