Merge branch 'master' of http://192.168.101.10:13000/gogs/zhaoshangyinzi

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BmProjectController.java

@@ -148,7 +148,6 @@ public class BmProjectController extends BaseController {
     /**
      * 首页查询待审核列表
      */
-    @PreAuthorize("@ss.hasPermi('bmProject:project:toBeReviewedList')")
     @GetMapping("/toBeReviewedList")
     public TableDataInfo toBeReviewedList(BmProject bmProject) {
         startPage();

ruoyi-system/src/main/resources/mapper/system/project/BmConstructionPayMapper.xml

@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select p.id, p.bm_project_id, p.create_by, p.create_time, p.update_by, p.update_time, p.is_del, p.pay_for_type, p.pay_for_money,  p.photo, d.dict_label as payForTypeName
         from bm_construction_pay p
         left join sys_dict_data d on p.pay_for_type = d.dict_value and d.dict_type = 'project_pay' and p.is_del = '0'
-        where p.bm_project_id = #{project}
+        where p.bm_project_id = #{project} limit 1
     </select>
         
     <insert id="insertBmConstructionPay" parameterType="BmConstructionPay">