|
|
@@ -574,7 +574,7 @@ public class AdminCustomerApiController extends BaseApiController{
|
|
|
for (int idx = 0; idx < ja.size(); idx++) {
|
|
|
userBusiness = ja.getJSONObject(idx).toJavaObject(BusinessListBo.class);
|
|
|
for(BusinessListBo ub:list){
|
|
|
- if(ub.getBusinessProjectId() == userBusiness.getBusinessProjectId()){
|
|
|
+ if(Objects.equals(ub.getBusinessProjectId(), userBusiness.getBusinessProjectId())){
|
|
|
res.getError().add(new com.goafanti.common.bo.Error("业务类型重复,请检查后重新提交!"));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -624,7 +624,7 @@ public class AdminCustomerApiController extends BaseApiController{
|
|
|
JSONArray ja = (JSONArray) JSON.parse(contactList);
|
|
|
List<OrganizationContactBook> ocbList = new ArrayList<OrganizationContactBook>();
|
|
|
OrganizationContactBook ocb = null;
|
|
|
- if(ja != null & !ja.isEmpty()){
|
|
|
+ if(ja != null && !ja.isEmpty()){
|
|
|
for (int idx = 0; idx < ja.size(); idx++) {
|
|
|
ocb = ja.getJSONObject(idx).toJavaObject(OrganizationContactBook.class);
|
|
|
if(StringUtils.isBlank(ocb.getMobile()) || StringUtils.isBlank(ocb.getName())){
|