x

src/main/java/com/egolm/film/api/service/impl/FilmServiceImpl.java

@@ -549,7 +549,7 @@ public class FilmServiceImpl implements FilmService {
 	}
 
 	@Override
-	public void verifyFilmDuplicate(Long member_film_id) {
+	public void verifyFilmDuplicate(Long filmId) {
 		String sql0 = ""
 				+ "select "
 					+ "f.* "
@@ -559,10 +559,10 @@ public class FilmServiceImpl implements FilmService {
 				+ "where "
 					+ "(f.apply_state = 2) "
 					// + "(f.apply_state = 2 or f.apply_state = 3) "
-					+ "and (f.en_name = f2.en_name or f.cn_name = f2.cn_name) "
+					+ "and (f.en_name = f2.en_name and f.cn_name = f2.cn_name) "
 					+ "and f2.id = ? "
 					+ "and f.id != ?";
-		List<Fc_member_film> list = jdbcTemplate.queryForBeans(sql0, Fc_member_film.class, member_film_id, member_film_id);
+		List<Fc_member_film> list = jdbcTemplate.queryForBeans(sql0, Fc_member_film.class, filmId, filmId);
 		if(list.size() > 0) {
 			String sql = ""
 					+ "select "
@@ -576,8 +576,8 @@ public class FilmServiceImpl implements FilmService {
 						+ "and fp.playactor_name = fp2.playactor_name "
 						+ "and fp2.film_id = ? "
 						+ "and fp.film_id != ?";
-			Integer count = jdbcTemplate.queryForInt(sql, member_film_id, member_film_id);
-			if(count > 0) {
+			Integer count = jdbcTemplate.queryForInt(sql, filmId, filmId);
+			if(count > 0 && count == jdbcTemplate.queryForInt("select count(fp.id) from fc_member_film_playactor fp where fp.playactor_type = 'director' and fp.film_id = ?", filmId)) {
 				Fc_member_film film = list.get(0);
 				Long passtime = film.getPass_time();
 				if(passtime == null) {