Merge branch 'develop' of https://gitlab.dituhui.com/bsh/project/project into develop

project-order/src/main/java/com/dituhui/pea/order/dao/MapBlockInfoDao.java

@@ -18,6 +18,8 @@ public interface MapBlockInfoDao extends JpaRepository<MapBlockInfoEntity, Integ
 
 
     List<MapBlockInfoEntity> findByGroupId(String groupId);
     List<MapBlockInfoEntity> findByGroupId(String groupId);
 
 
+    List<MapBlockInfoEntity> findByTeamId(String teamId);
+
     List<MapBlockInfoEntity> findByLayerId(String layerId);
     List<MapBlockInfoEntity> findByLayerId(String layerId);
 
 
     MapBlockInfoEntity findByTeamIdAndLayerId(String teamId, String layerId);
     MapBlockInfoEntity findByTeamIdAndLayerId(String teamId, String layerId);
@@ -28,7 +30,7 @@ public interface MapBlockInfoDao extends JpaRepository<MapBlockInfoEntity, Integ
 
 
     @Query(value = "select mbi.*  from map_block_info mbi left join map_layer_customize_skill mlcs  on mlcs.layer_id = mbi.layer_id " +
     @Query(value = "select mbi.*  from map_block_info mbi left join map_layer_customize_skill mlcs  on mlcs.layer_id = mbi.layer_id " +
             "left join map_layer_customize mlc  on mlc.layer_id = mbi.layer_id left join skill_info si on si.skill_code  = mlcs.skill_code " +
             "left join map_layer_customize mlc  on mlc.layer_id = mbi.layer_id left join skill_info si on si.skill_code  = mlcs.skill_code " +
-            "where si.brand = :brand and si.`type` = :productType and si.skill = :skill order by mlc.priority ", nativeQuery = true)
+            "where mbi.status = 1 and  mlcs.status = 1 and mlc.status = 1 and si.brand = :brand and si.`type` = :productType and si.skill = :skill order by mlc.priority ", nativeQuery = true)
     List<MapBlockInfoEntity> listTeamIdByBrandAndSkill(@Param("brand") String brand, @Param("productType") String productType,
     List<MapBlockInfoEntity> listTeamIdByBrandAndSkill(@Param("brand") String brand, @Param("productType") String productType,
                                                                   @Param("skill") String skill);
                                                                   @Param("skill") String skill);
 }
 }

project-order/src/main/java/com/dituhui/pea/order/entity/MapBlockInfoEntity.java

 package com.dituhui.pea.order.entity;
 package com.dituhui.pea.order.entity;
 
 
 import lombok.Data;
 import lombok.Data;
+import org.hibernate.annotations.Where;
 
 
 import javax.persistence.*;
 import javax.persistence.*;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
@@ -8,6 +9,7 @@ import java.time.LocalDateTime;
 @Data
 @Data
 @Entity
 @Entity
 @Table(name = "map_block_info")
 @Table(name = "map_block_info")
+@Where(clause = "status = 1")
 public class MapBlockInfoEntity {
 public class MapBlockInfoEntity {
 
 
     @Id
     @Id

project-order/src/main/java/com/dituhui/pea/order/entity/MapLayerCustomizeEntity.java

 package com.dituhui.pea.order.entity;
 package com.dituhui.pea.order.entity;
 
 
 import lombok.Data;
 import lombok.Data;
+import org.hibernate.annotations.Where;
 
 
 import javax.persistence.*;
 import javax.persistence.*;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
@@ -9,6 +10,7 @@ import java.util.Date;
 @Entity
 @Entity
 @Data
 @Data
 @Table(name = "map_layer_customize")
 @Table(name = "map_layer_customize")
+@Where(clause = "status = 1")
 public class MapLayerCustomizeEntity {
 public class MapLayerCustomizeEntity {
 
 
     @Id
     @Id

project-order/src/main/java/com/dituhui/pea/order/entity/MapLayerCustomizeSkillEntity.java

 package com.dituhui.pea.order.entity;
 package com.dituhui.pea.order.entity;
 
 
 import lombok.Data;
 import lombok.Data;
+import org.hibernate.annotations.Where;
 
 
 import javax.persistence.*;
 import javax.persistence.*;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
@@ -8,6 +9,7 @@ import java.time.LocalDateTime;
 @Entity
 @Entity
 @Data
 @Data
 @Table(name = "map_layer_customize_skill")
 @Table(name = "map_layer_customize_skill")
+@Where(clause = "status = 1")
 public class MapLayerCustomizeSkillEntity {
 public class MapLayerCustomizeSkillEntity {
 	@Id
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	@GeneratedValue(strategy = GenerationType.IDENTITY)