@@ -350,9 +350,8 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
}
@Override
public boolean judgeBeing(BusinessProject s) {
- BusinessProject bp=businessProjectMapper.selectByPrimaryKey(s.getId());
- BusinessProject bp1=businessProjectMapper.selectByPrimaryBname(s.getBname());
- if (null==bp||null==bp1||bp.getId().equals(bp1.getId())) {
+ BusinessProject bp=businessProjectMapper.selectByPrimaryBname(s.getBname());
+ if (null==bp||bp.getId().equals(s.getId())) {
return false;
}else {
return true;
@@ -748,7 +748,8 @@
select
<include refid="Base_Column_List" />
from business_project
- where bname = #{bname,jdbcType=VARCHAR}
+ where delete_sign=0 and status=0
+ and bname = #{bname,jdbcType=VARCHAR}
</select>
<select id="getBusinessProject" resultType="com.goafanti.business.bo.ProjectBo">
select id,bname as name,min_logo as minLogoUrl,introduce,project_url as projectUrl
@@ -223,9 +223,10 @@ public class ThirdPartyCompanyServiceImpl extends BaseMybatisDao<ThirdPartyComp
for (OutThirdPartyCompany oc : list) {
// start_type 0外包 1供应商
if (oc.getStartType()==1) {
+ //project_tyoe 0 正常 1专利 2软著 3审计
+ if(op==null)op=new outProjectBo();
if(op.getProjectType()==null)op.setProjectType(0);
//patent_type 专利类型 0申请/变更/转让 1买卖
- //project_tyoe 0 正常 1专利 2软著 3审计
if((op.getProjectType()==1&&oc.getPatentType()==0)
|| op.getProjectType()==2 ) {
oc.setUnitPrice("***");