lyhzzz пре 11 месеци
родитељ
комит
e06fd7edeb
1 измењених фајлова са 4 додато и 2 уклоњено
  1. 4 2
      src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

+ 4 - 2
src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -344,8 +344,10 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 }
                 }
             }
             }
             if(record.getLocation() != null && (record.getLocation() == 5 || record.getLocation() == 6)){
             if(record.getLocation() != null && (record.getLocation() == 5 || record.getLocation() == 6)){
-                record.setSlamCount(record.getShootCount());
-                record.setShootCount(null);
+                if(record.getMixture() != 1){
+                    record.setSlamCount(record.getShootCount());
+                    record.setShootCount(null);
+                }
             }
             }
         }
         }
         return PageInfo.PageInfo(page);
         return PageInfo.PageInfo(page);