Bladeren bron

修改bug

lwhhszx 2 jaren geleden
bovenliggende
commit
9ead19bc8d

+ 0 - 2
RMS/src/main/java/cn/cslg/report/controller/ReportController.java

@@ -149,6 +149,4 @@ public class ReportController {
         }
         return Response.error("添加失败");
     }
-
-
 }

+ 0 - 1
RMS/src/main/java/cn/cslg/report/service/business/FeatureService.java

@@ -220,7 +220,6 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Features> {
             //特征序号
             Integer order = 1;
             List<Features> featuresList = new ArrayList<>();
-
             int rightId = patentRights.get(i).getSort();
             String name = "权要" + (patentRights.get(i).getSort() + 1);
             //对需要拆解的权要进行拆解

+ 1 - 1
RMS/src/main/resources/mapper/ReportFieldMapper.xml

@@ -102,7 +102,7 @@
     <select id="getFieldPatentNos" parameterType="java.util.List" resultType="java.lang.String">
 
         select distinct c.PATENT_NO from COMPARE_FILES c <where>
-        <foreach collection="params" item="item" separator=" and ">
+        <foreach collection="params" item="item" separator=" or ">
             c.PATENT_NO in (
             select distinct a.PATENT_NO from COMPARE_FILES a left join  OS_PATENT_FIELD_PATENT_LINK b on a.PATENT_NO =b.PATENT_NO
             and b.CID=#{item.field}