技术方案库问题修改

bonus-admin/src/main/java/com/bonus/web/service/enterprise/ToolService.java

@@ -257,6 +257,7 @@ public class ToolService {
             }
         } catch (Exception e) {
             log.error(e.toString(), e);
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error(e.getMessage());
         }
         return AjaxResult.success();

bonus-common/src/main/java/com/bonus/common/domain/mainDatabase/dto/ToolDto.java

@@ -106,8 +106,8 @@ public class ToolDto {
     /**
      * 资源文件
      */
-    @NotEmpty(message = "文件不能为空", groups = {TechnicalDto.TechnicalDataDto.ADD.class})
-    @Size(min = 1,message = "最少上传一个文件", groups = {TechnicalDto.TechnicalDataDto.ADD.class})
+    @NotEmpty(message = "文件不能为空", groups = {ADD.class,IMPORT.class})
+    @Size(min = 1,message = "最少上传一个文件", groups = {ADD.class,IMPORT.class})
     private List<ResourceFilePo> files;
 
     /**删除的文件*/

bonus-mainDatabase/src/main/resources/mapper/TechnicalMapper.xml

@@ -142,7 +142,7 @@
                     INSTR(tets.technical_name,#{technicalName}) > 0
                 </if>
                 <if test="natureConstruction!=null and natureConstruction!=''">
-                    AND tets.nature_construction = #{natureConstruction}
+                    AND FIND_IN_SET(#{natureConstruction}, tets.nature_construction) > 0
                 </if>
                 <if test="structuralForm!=null and structuralForm!=''">
                     AND tets.structural_form = #{structuralForm}