mlx

simulation-resource-server/pom.xml

@@ -125,7 +125,7 @@
         <dependency>
             <groupId>com.itextpdf</groupId>
             <artifactId>itextpdf</artifactId>
-            <version>5.5.6</version>
+            <version>5.5.13.3</version>
         </dependency>
         <dependency>
             <groupId>com.itextpdf</groupId>
@@ -139,10 +139,10 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring-boot.version}</version>
                 <configuration>
                     <fork>true</fork>
                     <addResources>true</addResources>
-                    <mainClass>com.css.simulation.resource.Application</mainClass>
                 </configuration>
                 <executions>
                     <execution>

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/mapper/ScoringRulesMapper.java

@@ -30,9 +30,11 @@ public interface ScoringRulesMapper {
 
     void deleteScoringRules(ScoringRulesPO params);
 
-    @Select("select rules_id\n" +
-            "from scoring_rules\n" +
-            "where is_deleted = '1'\n" +
-            "  and rules_id in (select rules_id from scene_package_sublist where root_id = #{packageId})")
+    @Select("select sr.rules_id\n" +
+            "from scoring_rules sr\n" +
+            "where sr.is_deleted = '1'\n" +
+            "  and sr.rules_id in (select sps.package_and_rules\n" +
+            "                      from scene_package_sublist sps\n" +
+            "                      where sps.is_deleted = '0' and sps.root_id = #{packageId})")
     List<String> selectDeletedRulesByPackageId(@Param("packageId") String scenePackageId);
 }