校验

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

@@ -143,7 +143,7 @@ public class BizSqrEnterpriseApplyServiceImpl implements BizSqrEnterpriseApplySe
                 }
 
             }else{
-                if(bizSqrEnterpriseApply.getId()!=null){//有数据
+                if(bizSqrEnterpriseApply.getId()!=null){
                     bizSqrEnterpriseService.delete(bizSqrEnterpriseApply.getSqrEnterpriseId());
                     bizSqrEnterpriseApplyMapper.delete(bizSqrEnterpriseApply.getId());
 
@@ -181,12 +181,6 @@ public class BizSqrEnterpriseApplyServiceImpl implements BizSqrEnterpriseApplySe
 
                 }else{
                     if(bizSqrEnterpriseApply.getApplyType()!=4){
-                        saveAndcreatEbizSqrEnterprise(bizSqrEnterpriseApply,userName);
-                        saveAndcreatRequest(bizSqrEnterpriseApply,userName);
-                    }else{
-                        bizSqrEnterpriseApplyMapper.delete(bizSqrEnterpriseApply.getId());
-                        bizSqrEnterpriseApply.setCreateTime(new Date());
-                        bizSqrEnterpriseApply.setUpdateTime(new Date());
                         if(bizSqrEnterpriseApply.getApplyType()==1){
                             if(bizSqrEnterprise!=null){
                                 modelMap.put("error", "该企业已有承储资格，请勿重复申请");
@@ -195,6 +189,13 @@ public class BizSqrEnterpriseApplyServiceImpl implements BizSqrEnterpriseApplySe
                         }
                         saveAndcreatEbizSqrEnterprise(bizSqrEnterpriseApply,userName);
                         saveAndcreatRequest(bizSqrEnterpriseApply,userName);
+                    }else{
+                        bizSqrEnterpriseApplyMapper.delete(bizSqrEnterpriseApply.getId());
+                        bizSqrEnterpriseApply.setCreateTime(new Date());
+                        bizSqrEnterpriseApply.setUpdateTime(new Date());
+
+                        saveAndcreatEbizSqrEnterprise(bizSqrEnterpriseApply,userName);
+                        saveAndcreatRequest(bizSqrEnterpriseApply,userName);
                     }
                 }