Procházet zdrojové kódy

RD导入逻辑修改,判定公司名称+研发活动名称,相同覆盖,不同则新增

anderx před 2 roky
rodič
revize
d60ed3ef3d

+ 1 - 1
src/main/java/com/goafanti/RD/service/impl/RDServiceImpl.java

@@ -124,7 +124,7 @@ public class RDServiceImpl extends BaseMybatisDao<RdDetailsMapper> implements RD
             if (StringUtils.isNotEmpty(in.getRdName())){
                 RdCount++;
                 OkCount++;
-                RdDetails details = rdDetailsMapper.selectByRDName(in.getRdName());
+                RdDetails details = rdDetailsMapper.selectByRDName(in.getRdName(),in.getUserName());
                 if (details==null){
                     try {
                         in.setStatus(1);

+ 1 - 1
src/main/java/com/goafanti/common/dao/RdDetailsMapper.java

@@ -34,5 +34,5 @@ public interface RdDetailsMapper {
      */
     int updateBrowseOrDownload(@Param("id")Long id, @Param("type")Integer type);
 
-    RdDetails selectByRDName(String rdName);
+    RdDetails selectByRDName(@Param("rdName") String rdName, @Param("userName") String userName);
 }

+ 1 - 0
src/main/java/com/goafanti/common/mapper/RdDetailsMapper.xml

@@ -379,6 +379,7 @@
     <include refid="Base_Column_List" />
     from rd_details
     where rd_name= #{rdName}
+    and user_name= #{userName}
   </select>
 
 </mapper>