户配置代码提交

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java

@@ -55,35 +55,12 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
 	@Override
 	public R saveInfo(SysHouseHoldInfo sysHouseHoldInfo) {
 
-		SysHouseHoldInfo info = null;
-		if (null != sysHouseHoldInfo.getTown()){
-			info =  this.getOne(Wrappers.<SysHouseHoldInfo>query().lambda()
-					.eq(SysHouseHoldInfo::getType,info.getType())
-					.eq(SysHouseHoldInfo::getName,info.getName())
-					.eq(SysHouseHoldInfo::getTown,info.getTown())
-					.eq(SysHouseHoldInfo::getOrganName,info.getOrganName())
+		SysHouseHoldInfo info = this.getOne(Wrappers.<SysHouseHoldInfo>query().lambda()
+					.eq(SysHouseHoldInfo::getType,sysHouseHoldInfo.getType())
+					.eq(SysHouseHoldInfo::getName,sysHouseHoldInfo.getName())
 					.last(CommonConstants.LAST_ONE_SQL));
-		}
-		if (null != sysHouseHoldInfo.getCity() && null == sysHouseHoldInfo.getTown()){
-			info =  this.getOne(Wrappers.<SysHouseHoldInfo>query().lambda()
-					.eq(SysHouseHoldInfo::getType,info.getType())
-					.eq(SysHouseHoldInfo::getName,info.getName())
-					.eq(SysHouseHoldInfo::getCity,info.getCity())
-					.eq(SysHouseHoldInfo::getOrganName,info.getOrganName())
-					.isNull(SysHouseHoldInfo::getTown)
-					.last(CommonConstants.LAST_ONE_SQL));
-		}
-		if (null != sysHouseHoldInfo.getProvince() && null == sysHouseHoldInfo.getCity()){
-			info =  this.getOne(Wrappers.<SysHouseHoldInfo>query().lambda()
-					.eq(SysHouseHoldInfo::getType,info.getType())
-					.eq(SysHouseHoldInfo::getName,info.getName())
-					.eq(SysHouseHoldInfo::getProvince,info.getProvince())
-					.eq(SysHouseHoldInfo::getOrganName,info.getOrganName())
-					.isNull(SysHouseHoldInfo::getCity)
-					.last(CommonConstants.LAST_ONE_SQL));
-		}
 		if (null != info){
-			return R.failed("对应户、地市、所属机构的配置已存在！");
+			return R.failed("对应账户性质、户名的配置已存在！");
 		}
 		baseMapper.insert(sysHouseHoldInfo);
 		return R.ok();