瀏覽代碼

针对上海民用航空合同编号支持重复

QuYueTing 6 月之前
父節點
當前提交
3c164ca5cb

+ 3 - 3
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ContractServiceImpl.java

@@ -351,7 +351,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
             return httpRespMsg;
         }
         //合同编号不可重复
-        if (StringUtils.isNotBlank(contract.getNumber())){
+        if (StringUtils.isNotBlank(contract.getNumber()) && user.getCompanyId() != 4215){
             for (Contract ContractNumber: contracts) {
                 if (ContractNumber.getNumber() != null && ContractNumber.getNumber().equals(contract.getNumber())){
                     httpRespMsg.setError("[" + ContractNumber.getNumber() + "]" + MessageUtils.message("contract.numberRepeat"));
@@ -447,7 +447,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
                 return httpRespMsg;
             }
             //合同编号不可重复
-            if (StringUtils.isNotBlank(contract.getNumber())){
+            if (StringUtils.isNotBlank(contract.getNumber()) && user.getCompanyId() != 4215){
                 Contract number = contractMapper.selectOne(new QueryWrapper<Contract>().eq("number", contract.getNumber()).eq("company_id", contract.getCompanyId()));
                 if (number != null && !number.getId().equals(contract.getId())){
                     httpRespMsg.setError("[" + contract.getNumber() + "]" + MessageUtils.message("contract.numberRepeat"));
@@ -601,7 +601,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
                 String remarks = row.getCell(6)==null?null:row.getCell(6).getStringCellValue();
                 Contract item = new Contract();
                 //检查合同编号是否存在
-                if (StringUtils.isNotBlank(No)){
+                if (StringUtils.isNotBlank(No) && user.getCompanyId() != 4215){
                     for (Contract contract : contractList) {
                         if (No.equals(contract.getNumber())){
                             NoExists = true;