--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/series/SeriesController.java

@@ -54,9 +54,8 @@ public class SeriesController {
 	public CallBack<Boolean> save(@RequestBody SeriesForm form) {
 		Series series = new Series();
 		BeanUtils.copyProperties(form, series);
-		service.createCriteria().andEqualTo("seriesName", form.getSeriesName());
-		List<Series> list = service.selectByCriteria();
-		if(list.size()==0){
+		Integer nameCount = service.queryByNames(series.getSeriesName());
+		if(nameCount>0){
 			throw new BaseException(ResponseCodeEnum.REPEST);
 		}
 		series.setCreateTime(new Date());
@@ -86,8 +85,11 @@ public class SeriesController {
 	public CallBack<Boolean> update(@RequestBody SeriesForm form) {
 		Series series = new Series();
 		BeanUtils.copyProperties(form, series);
-		Integer nameCount = service.queryByName(series.getId(),series.getSeriesName());
-		if(nameCount>0){
+		Criteria criteria = service.createCriteria();
+		criteria.andEqualTo("id", form.getId());
+		criteria.andEqualTo("seriesName", form.getSeriesName());
+		Integer nameCount = service.selectCountByCriteria();
+		if(nameCount>1){
 			throw new BaseException(ResponseCodeEnum.REPEST);
 		}
 		if (!service.updateByPrimaryKeySelective(series)) {

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/series/SeriesMapper.java

@@ -29,4 +29,8 @@ public interface SeriesMapper extends BaseMapper<Series>{
 			+ " and id !=#{id}"
 			+ "</script>")
 	Integer queryByName(@Param("id")String id,@Param("name")String name);
+	@Select("<script>"
+			+ "SELECT count(*) FROM res_series WHERE seriesName = #{seriesName}"
+			+ "</script>")
+	Integer queryByNames(String seriesName);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/series/SeriesService.java

@@ -19,4 +19,6 @@ public interface SeriesService extends BaseService<Series, Integer> {
 	boolean isExist(String name);
 
 	Integer queryByName(String id, String name);
+
+	Integer queryByNames(String seriesName);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/series/SeriesServiceImpl.java

@@ -39,4 +39,10 @@ public class SeriesServiceImpl extends BaseServiceImpl<Series, Integer> implemen
 		// TODO Auto-generated method stub
 		return mapper.queryByName(id,name);
 	}
+
+	@Override
+	public Integer queryByNames(String seriesName) {
+		// TODO Auto-generated method stub
+		return mapper.queryByNames(seriesName);
+	}
 }