Update app.py

app.py

@@ -425,10 +425,23 @@ def execute_unified_search(base_std, base_ver, base_cat, comp_std, comp_ver, com
             df_comp['merge_key'] = df_comp[real_anchors_c].apply(lambda row: '-'.join(row.values.astype(str)), axis=1).str.replace(" ", "")
 
             conn_map = sqlite3.connect(os.path.join(UPLOAD_DIR, "mapping.db"))
-            q = "SELECT Base_section, Comp_section FROM Mapping_table WHERE TRIM(Base_std)=? AND TRIM(Base_ver)=? AND TRIM(Comp_std)=? AND TRIM(Comp_ver)=?"
-            df_fw = pd.read_sql(q, conn_map, params=[base_std.strip(), base_ver.strip(), comp_std.strip(), comp_ver.strip()])
-            q_rv = "SELECT Comp_section AS Base_section, Base_section AS Comp_section FROM Mapping_table WHERE TRIM(Comp_std)=? AND TRIM(Comp_ver)=? AND TRIM(Base_std)=? AND TRIM(Base_ver)=?"
-            df_rv = pd.read_sql(q_rv, conn_map, params=[base_std.strip(), base_ver.strip(), comp_std.strip(), comp_ver.strip()])
+            
+            # DB에 Base_Type, Comp_Type 컬럼이 있는지 확인 (에러 방지용)
+            map_cols = pd.read_sql("PRAGMA table_info(Mapping_table)", conn_map)['name'].tolist()
+            
+            if 'Base_Type' in map_cols and 'Comp_Type' in map_cols:
+                q = "SELECT Base_section, Comp_section FROM Mapping_table WHERE TRIM(Base_std)=? AND TRIM(Base_ver)=? AND TRIM(Base_Type)=? AND TRIM(Comp_std)=? AND TRIM(Comp_ver)=? AND TRIM(Comp_Type)=?"
+                df_fw = pd.read_sql(q, conn_map, params=[base_std.strip(), base_ver.strip(), type_b, comp_std.strip(), comp_ver.strip(), type_c])
+                
+                q_rv = "SELECT Comp_section AS Base_section, Base_section AS Comp_section FROM Mapping_table WHERE TRIM(Comp_std)=? AND TRIM(Comp_ver)=? AND TRIM(Comp_Type)=? AND TRIM(Base_std)=? AND TRIM(Base_ver)=? AND TRIM(Base_Type)=?"
+                df_rv = pd.read_sql(q_rv, conn_map, params=[base_std.strip(), base_ver.strip(), type_b, comp_std.strip(), comp_ver.strip(), type_c])
+            else:
+                # 구버전 DB 호환용 (Type 미구분)
+                q = "SELECT Base_section, Comp_section FROM Mapping_table WHERE TRIM(Base_std)=? AND TRIM(Base_ver)=? AND TRIM(Comp_std)=? AND TRIM(Comp_ver)=?"
+                df_fw = pd.read_sql(q, conn_map, params=[base_std.strip(), base_ver.strip(), comp_std.strip(), comp_ver.strip()])
+                q_rv = "SELECT Comp_section AS Base_section, Base_section AS Comp_section FROM Mapping_table WHERE TRIM(Comp_std)=? AND TRIM(Comp_ver)=? AND TRIM(Base_std)=? AND TRIM(Base_ver)=?"
+                df_rv = pd.read_sql(q_rv, conn_map, params=[base_std.strip(), base_ver.strip(), comp_std.strip(), comp_ver.strip()])
+            
             conn_map.close()
 
             df_mapping = pd.concat([df_fw, df_rv], ignore_index=True)
@@ -441,7 +454,8 @@ def execute_unified_search(base_std, base_ver, base_cat, comp_std, comp_ver, com
             else:
                 df_mapping = pd.DataFrame(columns=['Base_section', 'Comp_section'])
 
-            if base_std.strip().upper() == comp_std.strip().upper():
+            # [수정] 같은 법규 & 같은 카테고리일 때만 번호 일치 자동 매핑 허용
+            if base_std.strip().upper() == comp_std.strip().upper() and type_b == type_c:
                 implicit = pd.DataFrame({'Base_section': list(set(df_base['merge_key']) & set(df_comp['merge_key'])), 
                                          'Comp_section': list(set(df_base['merge_key']) & set(df_comp['merge_key']))})
                 bridge = pd.concat([df_mapping, implicit], ignore_index=True).drop_duplicates()