|
@@ -704,13 +704,8 @@
|
|
|
)REMARK,
|
|
|
(SELECT DICT_LABEL FROM SYS_DICT_DATA WHERE DICT_VALUE = MODEL) MODEL,
|
|
|
HIK_IP,HIK_PORT,HIK_USERNAME,HIK_PASSWORD,HIK_DEVICEPORT,HIK_CAMERA_ID
|
|
|
- FROM T_RES_CAMERA
|
|
|
+ FROM T_RES_CAMERA t
|
|
|
WHERE 1=1
|
|
|
- AND DEPT_ID IN (
|
|
|
- <include refid="Depts">
|
|
|
- <property name="dept_id" value="#{DEPTID}"/>
|
|
|
- </include>
|
|
|
- )
|
|
|
<if test="NAME != null and NAME != ''">
|
|
|
AND NAME LIKE '%${NAME}%'
|
|
|
</if>
|
|
@@ -723,6 +718,8 @@
|
|
|
<if test="REMARK != null and REMARK != ''">
|
|
|
AND DEPT_ID = '${REMARK}'
|
|
|
</if>
|
|
|
+ <!-- 数据范围过滤 -->
|
|
|
+ ${params.dataScope}
|
|
|
order by seq asc
|
|
|
</select>
|
|
|
|