bug

src/main/java/com/chinaitop/depot/sqr/service/impl/BizSqrEnterpriseApplyServiceImpl.java

@@ -132,10 +132,7 @@ public class BizSqrEnterpriseApplyServiceImpl implements BizSqrEnterpriseApplySe
         BizSqrEnterpriseApply bizSqrEnterpriseApply = (BizSqrEnterpriseApply) mapper.readValue(bizSqrEnterpriseApplyJson, BizSqrEnterpriseApply.class);
         String unitInfoId =bizSqrEnterpriseApply.getUnitInfoId();
         BizSqrEnterprise bizSqrEnterprise=bizSqrEnterpriseMapper.fibdByEnterprise(unitInfoId);
-        if(bizSqrEnterprise!=null){
-            modelMap.put("error", "该企业已有承储资格，请勿重复申请");
-            return modelMap;
-        }
+
        // BizSqrEnterpriseApply bSqrEnterpriseApply = bizSqrEnterpriseApplyService.findById(bizSqrEnterpriseApplyId);
         if(bizSqrEnterpriseApply.getApplyStatus()==0){//保存
             if(bizSqrEnterpriseApply.getApplyType()==4){
@@ -145,6 +142,7 @@ public class BizSqrEnterpriseApplyServiceImpl implements BizSqrEnterpriseApplySe
                     bizSqrEnterpriseApply.setUpdateTime(new Date());
                     bizSqrEnterpriseApplyMapper.insert(bizSqrEnterpriseApply);
                 }else{
+
                     bizSqrEnterpriseApply.setCreateTime(new Date());
                     bizSqrEnterpriseApply.setUpdateTime(new Date());
                     bizSqrEnterpriseApplyMapper.insert(bizSqrEnterpriseApply);
@@ -154,9 +152,15 @@ public class BizSqrEnterpriseApplyServiceImpl implements BizSqrEnterpriseApplySe
                 if(bizSqrEnterpriseApply.getId()!=null){//有数据
                     bizSqrEnterpriseService.delete(bizSqrEnterpriseApply.getSqrEnterpriseId());
                     bizSqrEnterpriseApplyMapper.delete(bizSqrEnterpriseApply.getId());
+
                     saveAndcreatEbizSqrEnterprise(bizSqrEnterpriseApply,userName);
                 }else{
-
+                    if(bizSqrEnterpriseApply.getApplyType()==1){
+                        if(bizSqrEnterprise!=null){
+                            modelMap.put("error", "该企业已有承储资格，请勿重复申请");
+                            return modelMap;
+                        }
+                    }
                         saveAndcreatEbizSqrEnterprise(bizSqrEnterpriseApply,userName);
 
 
@@ -189,7 +193,12 @@ public class BizSqrEnterpriseApplyServiceImpl implements BizSqrEnterpriseApplySe
                         bizSqrEnterpriseApplyMapper.delete(bizSqrEnterpriseApply.getId());
                         bizSqrEnterpriseApply.setCreateTime(new Date());
                         bizSqrEnterpriseApply.setUpdateTime(new Date());
-
+                        if(bizSqrEnterpriseApply.getApplyType()==1){
+                            if(bizSqrEnterprise!=null){
+                                modelMap.put("error", "该企业已有承储资格，请勿重复申请");
+                                return modelMap;
+                            }
+                        }
                         saveAndcreatEbizSqrEnterprise(bizSqrEnterpriseApply,userName);
                         saveAndcreatRequest(bizSqrEnterpriseApply,userName);
                     }
@@ -224,6 +233,7 @@ public class BizSqrEnterpriseApplyServiceImpl implements BizSqrEnterpriseApplySe
             bizSqrEnterprise.setStatus(bizSqrEnterpriseApply.getApplyStatus());
             bizSqrEnterprise.setCreateTime(new Date());
             bizSqrEnterprise.setUpdateTime(new Date());
+
             bizSqrEnterpriseService.add(bizSqrEnterprise);
             bizSqrEnterpriseApply.setSqrEnterpriseId(bizSqrEnterprise.getId());
             bizSqrEnterpriseApply.setCreateTime(new Date());