fix：修复问题

shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousTaskMapper.java

@@ -62,11 +62,12 @@ public interface DfDangerousTaskMapper extends BaseMapper<DfDangerousTask> {
 
 
     @Select("<script>" +
-            "SELECT  rw.id, rw.NAME, rw.GROUP_ID as groupId, rw.DIKE_CODE as dikeCode, rw.START_TIME as startTime, rw.DONE_TIME as doneTime, rw.CONTENT as content, rw.state, df.dike_name as dikeName, df.river_location as riverLocation,  " +
+            "SELECT  rw.id, rw.NAME, fz.name as groupName, rw.GROUP_ID as groupId, rw.DIKE_CODE as dikeCode, rw.START_TIME as startTime, rw.DONE_TIME as doneTime, rw.CONTENT as content, rw.state, df.dike_name as dikeName, df.river_location as riverLocation,  " +
             "gl.engineering_management_unit as engineeringManagementUnit, df.adcd_start as adcdStart, df.adcd_end as adcdEnd, df.dike_grad as  dikeGrad, df.DIKE_PATT as  dikePatt, df.DIKE_TYPE as dikeType, rw.remark " +
             "FROM bs_sgc_df_bxgcrw rw " +
             "LEFT JOIN bs_sgc_df_gcda df  ON rw.dike_code = df.dike_code " +
             "LEFT JOIN bs_sgc_df_gcgl gl  ON rw.dike_code = gl.dike_code " +
+            "LEFT JOIN bs_sgc_df_bxgcfz fz  ON rw.GROUP_ID = fz.id " +
             "WHERE  df.expr_date is null  " +
             "AND gl.expr_date is null " +
             "<if test='id != null and id != \"\"'>" +

shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousTaskMapper.java

@@ -61,11 +61,12 @@ public interface SzDangerousTaskMapper extends BaseMapper<SzDangerousTask> {
 
 
     @Select("<script>" +
-            "SELECT  rw.id, rw.NAME, rw.GROUP_ID as groupId, rw.waga_code as wagaCode, rw.START_TIME as startTime, rw.DONE_TIME as doneTime, rw.CONTENT as content, rw.state, " +
+            "SELECT  rw.id, rw.NAME, fz.name as groupName, rw.GROUP_ID as groupId, rw.waga_code as wagaCode, rw.START_TIME as startTime, rw.DONE_TIME as doneTime, rw.CONTENT as content, rw.state, " +
             "df.waga_name as wagaName,  gl.engineering_management_unit as engineeringManagementUnit, df.adcd as adcd, df.ENG_SCAL as engScal , df.waga_type as wagaType,df.MAIN_BUILD_GRAD as  mainBuildGrad, rw.remark " +
             "FROM bs_sgc_sz_bxgcrw rw " +
             "LEFT JOIN bs_sgc_sz_jbxx df  ON rw.waga_code = df.waga_code " +
             "LEFT JOIN bs_sgc_sz_gcgl gl  ON rw.waga_code = gl.waga_code " +
+            "LEFT JOIN bs_sgc_sz_bxgcfz fz  ON rw.GROUP_ID = fz.id " +
             "WHERE  df.expr_date is null  " +
             "AND gl.expr_date is null " +
             "<if test='id != null and id != \"\"'>" +