代码提交

bonus-admin/src/main/resources/mapper/FileManageMapper.xml

@@ -254,7 +254,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				LEFT JOIN da_ky_files_classify_mark dkfcm ON dkpfc.classify_mark = dkfcm.id
 				LEFT JOIN da_ky_sys_file_source dkfs ON dkpfc.id = dkfs.business_id
 		WHERE
-			dkpfc.id = #{id}
+			dkpfc.id = #{id} and dkpfc.pro_id = #{proId}
 	</select>
 	<select id="getFileById" resultType="com.bonus.web.domain.vo.DaKyProFilesContentsVo">
 		SELECT * from  da_ky_sys_file_source where  id = #{id}

bonus-system/src/main/java/com/bonus/system/domain/SystemConfig.java

@@ -19,7 +19,7 @@ import javax.validation.constraints.Size;
 public class SystemConfig extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    private Long configId;
+    private Long id;
     private String configName;
     private String configCode;
     private String useStatus;