77

science-admin/src/main/java/com/yiboshi/science/service/impl/ComUnitServiceImpl.java

@@ -434,7 +434,7 @@ public class ComUnitServiceImpl extends BaseServiceImpl<ComUnitDAO, ComUnitQuery
                 || StringUtils.isEmpty(unit.getLinkName())
                 || StringUtils.isEmpty(unit.getTelephone())
                 || StringUtils.isEmpty(unit.getEmail())
-                || StringUtils.isEmpty(unit.getFax())
+//                || StringUtils.isEmpty(unit.getFax())
                 || StringUtils.isEmpty(unit.getOrganizationCode())
                 || StringUtils.isEmpty(unit.getRegisteredAddress())
                 || StringUtils.isEmpty(unit.getPostCode())
@@ -442,10 +442,10 @@ public class ComUnitServiceImpl extends BaseServiceImpl<ComUnitDAO, ComUnitQuery
                 || Objects.isNull(unit.getWorkforce())
                 || Objects.isNull(unit.getSpecializedPersonnel())
                 || Objects.isNull(unit.getResearchPersonnel())
-                || StringUtils.isEmpty(unit.getDepositBank())
-                || StringUtils.isEmpty(unit.getBankAccount())
-                || StringUtils.isEmpty(unit.getDepositBankAddress())
-                || StringUtils.isEmpty(unit.getInterbankNumber())
+//                || StringUtils.isEmpty(unit.getDepositBank())
+//                || StringUtils.isEmpty(unit.getBankAccount())
+//                || StringUtils.isEmpty(unit.getDepositBankAddress())
+//                || StringUtils.isEmpty(unit.getInterbankNumber())
         ) {
             return false;
         }

science-admin/src/main/resources/mapper/ComProjectDAO.xml

@@ -48,7 +48,7 @@
                c.id download_id,c.download_url,c.file_name
         from com_project a
         left join com_project_basic ic on a.id=ic.proj_id
-        left join system_parameter b on a.knowledge_id=b.id
+        left join system_parameter b on a.knowledge_id=b.id and b.type_id=68
         left join com_download c on ic.file_id=c.id
         where a.id = #{id}
     </select>