整改清单报表

business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxProjectManageDao.java

@@ -35,7 +35,7 @@ public interface ZhcxProjectManageDao extends BaseMapper<ZhcxProjectManageDo> {
             "x.* FROM INCONTROL.ZHCX_PROJECT_RECTIFY_MACHINE x " +
             "LEFT JOIN SYS_DICT di ON x.DEPTID = di.ID AND di.DICTTYPE = 'rectification_organization' " +
             "LEFT JOIN SYS_DICT di2 ON x.FIRSTDEPTID  = di2.ID AND di.DICTTYPE = 'rectification_organization' " +
-            "where x.PRJID = #{projectId} " +
+            "<where> " +
             "<if test='batchId !=null'>" +
             "AND x.BATCHID=#{batchId}" +
             "</if>" +
@@ -46,6 +46,7 @@ public interface ZhcxProjectManageDao extends BaseMapper<ZhcxProjectManageDo> {
             "<if test='ifoutsidebase !=null'>" +
             "AND x.DEPTID is not null and x.IFOUTSIDEBASE in ('inside', 'outside')" +
             "</if>" +
+            "</where>" +
             "</script>")
     List<ZhcxProjectRectifyMachineVo> getListData(Map<String, Object> map);
 }