修改标签管理提示

laws-modules/src/main/java/com/jero/modules/tag/controller/LawsTagController.java

@@ -92,6 +92,7 @@ public class LawsTagController extends JeroController<LawsTag, ILawsTagService>
 		// TODO 这里有Bug，由于采用了逻辑删除标识，此查询会自动将已删除的数据过滤掉，所以无法查出重复数据。所以去掉逻辑删除的标识，删除的时候自己处理逻辑删除
 		queryWrapper.eq("db_field_txt", lawsTag.getDbFieldTxt()).eq("is_model", lawsTag.getIsModel());
 		List<LawsTag> existCgformTagList = this.lawsTagService.list(queryWrapper);
+//		List<LawsTag> existCgformTagList = this.lawsTagService.listByData(lawsTag.getDbFieldTxt(),lawsTag.getIsModel());
 		String dictId = lawsTag.getDictId();
 		if (StringUtils.isNotBlank(dictId)){
 			SysDict sysDict = dictMapper.selectById(dictId);

laws-modules/src/main/java/com/jero/modules/tag/mapper/LawsTagMapper.java

@@ -58,12 +58,12 @@ public interface LawsTagMapper extends BaseMapper<LawsTag> {
     int updateAllById(@Param("updated")LawsTag updated);
 
     /**
-     * 查看字段是否已存在
+     * 查询数据
-     * @param tableName 表名
+     * @param dbFieldTxt
-     * @param dbFieldName 字段名
+     * @param isModel
      * @return
      */
-    long selectColumns(@Param("tableName") String tableName,@Param("dbFieldName") String dbFieldName);
+    List<LawsTag> listByData(@Param("dbFieldTxt") String dbFieldTxt,@Param("isModel") String isModel);
 
 
 

laws-modules/src/main/java/com/jero/modules/tag/mapper/xml/LawsTagMapper.xml

@@ -169,10 +169,7 @@
         </set>
         where id = #{updated.id}
     </update>
-    <select id="selectColumns" resultType="java.lang.Long">
+    <select id="listByData" resultType="com.jero.modules.tag.entity.LawsTag">
-        SELECT count(*)
+        select * from laws_tag where db_field_txt = #{dbFieldTxt} and is_model = #{isModel}
-        FROM INFORMATION_SCHEMA.COLUMNS
-        WHERE TABLE_NAME = #{tableName}
-        AND COLUMN_NAME = #{dbFieldName}
     </select>
 </mapper>

laws-modules/src/main/java/com/jero/modules/tag/service/ILawsTagService.java

@@ -79,4 +79,12 @@ public interface ILawsTagService extends IService<LawsTag> {
 	 */
 	Integer queryExitArea(LawsArea lawsArea);
 
+	/**
+	 * 查询数据
+	 * @param dbFieldTxt
+	 * @param isModel
+	 * @return
+	 */
+	List<LawsTag> listByData(String dbFieldTxt,String isModel);
+
 }

laws-modules/src/main/java/com/jero/modules/tag/service/impl/ILawsTagServiceImpl.java

@@ -212,11 +212,6 @@ public class ILawsTagServiceImpl extends ServiceImpl<LawsTagMapper, LawsTag> imp
 		if (StringUtils.isNotBlank(dbFieldNameOld)){
 			sql = "alter table " + tableName + " change `" + dbFieldNameOld + "` `" + dbFieldName + "` " + type + " null comment '"+dbFieldTxt+"'";
 		}else {
-			// 验证字段是否存在
-			long l = lawsTagMapper.selectColumns(tableName,dbFieldName);
-			if(l > 0){
-				throw new JeroBootException(ResultCommon.TAG_EDIT_ERROR_2);
-			}
 			sql = "alter table " + tableName + " " + modifyOrAdd + " `" + dbFieldName + "` " + type + " null comment '"+dbFieldTxt+"'";
 		}
 
@@ -229,6 +224,10 @@ public class ILawsTagServiceImpl extends ServiceImpl<LawsTagMapper, LawsTag> imp
 				// 判断是否为SQLSyntaxErrorException
 				throw new JeroBootException(ResultCommon.ROW_SIZE_TOO_LARGE);
 			}
+			if(e.getMessage().contains("java.sql.SQLSyntaxErrorException: Duplicate column name")){
+				// 判断是否为SQLSyntaxErrorException
+				throw new JeroBootException(ResultCommon.TAG_EDIT_ERROR_2);
+			}
 			throw new JeroBootException(ResultCommon.ERROR);
 		}
 	}
@@ -303,4 +302,9 @@ public class ILawsTagServiceImpl extends ServiceImpl<LawsTagMapper, LawsTag> imp
 		Integer count = lawsTagMapper.selectCount(queryWrapper);
 		return count;
 	}
+
+	@Override
+	public List<LawsTag> listByData(String dbFieldTxt, String isModel) {
+		return lawsTagMapper.listByData(dbFieldTxt,  isModel);
+	}
 }