|
@@ -122,7 +122,7 @@ public class CompanyServiceImpl implements CompanyService {
|
|
|
return pcCompanyMapper.selectByExample(exp);
|
|
|
}
|
|
|
|
|
|
- private String ifHadRepeatData(CompanyVo data, boolean isEdit){
|
|
|
+ private String ifHadRepeatData(CompanyVo data, boolean isEdit,String curUserID){
|
|
|
var result = 0;
|
|
|
PcCompanyExample companyExp1 = new PcCompanyExample();
|
|
|
companyExp1.or().andCompanyNameEqualTo(data.getCompanyName()).andCompanyIDNotEqualTo(data.getCompanyID());
|
|
@@ -159,6 +159,8 @@ public class CompanyServiceImpl implements CompanyService {
|
|
|
if(isEdit){
|
|
|
if( curSiteInfo.getSiteID().equals("66fc1176-b8a1-4b9a-b2fc-9f590ceed342")||curSiteInfo.getSiteID().equals("0c037144-99c6-4e90-bf25-2c9cea8c7b7a")){
|
|
|
repeatData.setSiteID(data.getSiteID());
|
|
|
+ repeatData.setModifyTime(new Date());
|
|
|
+ repeatData.setModifyUserID(curUserID);
|
|
|
pcCompanyMapper.updateByPrimaryKey(repeatData);
|
|
|
return "-1";
|
|
|
}else{
|
|
@@ -184,7 +186,7 @@ public class CompanyServiceImpl implements CompanyService {
|
|
|
cro.andCompanyIDEqualTo(data.getCompanyID());
|
|
|
dbData = pcCompanyMapper.selectByExampleWithBLOBs(exp).stream().findFirst().orElse(null);
|
|
|
}
|
|
|
- var resultNum = Integer.valueOf(ifHadRepeatData(data,true));
|
|
|
+ var resultNum = Integer.valueOf(ifHadRepeatData(data,true,userId));
|
|
|
if( resultNum>0) {
|
|
|
throw new BaseException("1004","该企业已被录入!");
|
|
|
}
|
|
@@ -417,7 +419,7 @@ public class CompanyServiceImpl implements CompanyService {
|
|
|
if(!regexUtils.theCodeIsValid(item.companyCode)){
|
|
|
errorInfo +="输入的统一信用代码无效";
|
|
|
}else{
|
|
|
- var result = ifHadRepeatData(item,false);
|
|
|
+ var result = ifHadRepeatData(item,false,userID);
|
|
|
errorInfo += !result.equals("0")? result:"";
|
|
|
}
|
|
|
}
|