--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/recommend/RecommendSerivceImpl.java

@@ -32,22 +32,8 @@ public class RecommendSerivceImpl extends BaseServiceImpl<Recommend,Integer> imp
 
 	@Override
 	public boolean isExist(IsExistForm form){
-		//判断推荐位类型
-		if(form.getRecommendType() == null){
-			throw new ParameterValidateException(1, "推荐位类型不可以为空");
-		}
-		if(StringUtils.isBlank(form.getCode()) && StringUtils.isBlank(form.getName())){
-			throw new ParameterValidateException(1, "推荐位代码和推荐位名称不可以同时为空");
-		}
-		//关联民族：这个字段不是必填项，但是如果关联民族以后需要在前台首页民族医库展示；创建的时候需要验重，一个民族不能重复关联即可；
-		if(!form.getRecommendType().equals(RecommendTypeEnum.NATION_RECOMMEND.getCode()) && 
-				form.getNationsType() != null && form.getNationsType() != 0){
-			Recommend recommend = new Recommend();
-			recommend.setRecommendType(form.getRecommendType());
-			recommend.setNationsType(form.getNationsType());
-			if(mapper.select(recommend).size() >0){
-				throw new BusinessValidateException(2,"该关联民族已绑定");
-			}
+		if(StringUtils.isBlank(form.getCode()) || StringUtils.isBlank(form.getName())){
+			throw new ParameterValidateException(1, "推荐位代码和推荐位名称不可以为空");
 		}
 		//判断推荐位代码
 		if(StringUtils.isNotBlank(form.getCode())){
@@ -61,10 +47,6 @@ public class RecommendSerivceImpl extends BaseServiceImpl<Recommend,Integer> imp
 		if(StringUtils.isNotBlank(form.getName())){
 			Recommend recommend = new Recommend();
 			recommend.setName(form.getName());
-			recommend.setRecommendType(form.getRecommendType());
-			if(form.getNationsType() != null){
-				recommend.setNationsType(form.getNationsType());
-			}
 			if(mapper.select(recommend).size() > 0){ 
 				throw new BusinessValidateException(2,"推荐位名称已存在");
 			}
@@ -76,7 +58,7 @@ public class RecommendSerivceImpl extends BaseServiceImpl<Recommend,Integer> imp
 		if(form.getId() != null){
 			throw new ParameterValidateException(1,"id不能为空");
 		}
-		//判断推荐位代码
+		// 判断推荐位代码
 		if(StringUtils.isBlank(form.getCode())){
 			throw new ParameterValidateException(1, "推荐位代码不可以为空");
 		}else{
@@ -86,44 +68,22 @@ public class RecommendSerivceImpl extends BaseServiceImpl<Recommend,Integer> imp
 				throw new BusinessValidateException(2,"推荐位代码已存在");
 			}
 		}
-		//判断推荐位名称
+		// 判断推荐位名称
 		if(StringUtils.isBlank(form.getName())){
 			throw new ParameterValidateException(1, "推荐位名称不可以为空");
 		}else{
 			Recommend recommend = new Recommend();
 			recommend.setName(form.getName());
-			recommend.setRecommendType(form.getRecommendType());
-			if(form.getNationsType() != null){
-				recommend.setNationsType(form.getNationsType());
-			}
 			if(mapper.select(recommend).size() > 0){ 
 				throw new BusinessValidateException(2,"推荐位名称已存在");
 			}
 		}
 		Recommend recommend = new Recommend();
 		BeanUtils.copyProperties(form, recommend);
-		//添加
+		// 添加
 		recommend.setCreateTime(new Date());
 		recommend.setUpdateTime(new Date());
 		return mapper.insert(recommend) > 0;
 	}
-	/**
-	 * 通过民族、推荐位类型，查询推荐位id
-	 * @param query
-	 * @return
-	 * @author ycw
-	 * @date: 2018年12月27日 下午5:39:55
-	 */
-	@Override
-	public Integer queryRecommendIdByNationAndRecommendType(Integer nationsType) {
-		Recommend recommend = new Recommend();
-		recommend.setNationsType(nationsType);
-		recommend.setRecommendType(RecommendTypeEnum.NATIONPAGH_RECOMMEND.getCode());
-		List<Recommend> list = mapper.select(recommend);
-		if(list != null && list.size() > 0){
-			return list.get(0).getId();
-		}
-		return null;
-	}
 	
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/recommend/RecommendService.java

@@ -10,5 +10,4 @@ import com.zrqx.core.service.BaseService;
 public interface RecommendService extends BaseService<Recommend,Integer>{
 	boolean isExist(IsExistForm form);
 	boolean save(SaveRecommendForm form);
-	Integer queryRecommendIdByNationAndRecommendType(Integer nationsType); 
 }