Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 56827 标准合规评估流程-项目分发节点,选择项目逻辑 应该是“已维护”+“未维护”,现在查询的挺乱的 See merge request LiuChao/foton-slrs-system-rest!566
This commit is contained in:
+6
@@ -455,6 +455,9 @@
|
|||||||
select sar_stand_project_library.* , ts_user.UNAME as uName from sar_stand_project_library
|
select sar_stand_project_library.* , ts_user.UNAME as uName from sar_stand_project_library
|
||||||
left join ts_user on ts_user.USID = sar_stand_project_library.project_manager
|
left join ts_user on ts_user.USID = sar_stand_project_library.project_manager
|
||||||
where 1=1
|
where 1=1
|
||||||
|
<if test="sarStandProjectLibrary.flag != null and sarStandProjectLibrary.flag != ''">
|
||||||
|
and sar_stand_project_library.flag=#{sarStandProjectLibrary.flag}
|
||||||
|
</if>
|
||||||
<if test="sarStandProjectLibrary.managementHostName != null and sarStandProjectLibrary.managementHostName != ''">
|
<if test="sarStandProjectLibrary.managementHostName != null and sarStandProjectLibrary.managementHostName != ''">
|
||||||
and sar_stand_project_library.management_host_name=#{sarStandProjectLibrary.managementHostName}
|
and sar_stand_project_library.management_host_name=#{sarStandProjectLibrary.managementHostName}
|
||||||
</if>
|
</if>
|
||||||
@@ -481,6 +484,9 @@
|
|||||||
select count(sar_stand_project_library.id) from sar_stand_project_library
|
select count(sar_stand_project_library.id) from sar_stand_project_library
|
||||||
left join ts_user on ts_user.USID = sar_stand_project_library.project_manager
|
left join ts_user on ts_user.USID = sar_stand_project_library.project_manager
|
||||||
where 1=1
|
where 1=1
|
||||||
|
<if test="sarStandProjectLibrary.flag != null and sarStandProjectLibrary.flag != ''">
|
||||||
|
and sar_stand_project_library.flag=#{sarStandProjectLibrary.flag}
|
||||||
|
</if>
|
||||||
<if test="sarStandProjectLibrary.managementHostName != null and sarStandProjectLibrary.managementHostName != ''">
|
<if test="sarStandProjectLibrary.managementHostName != null and sarStandProjectLibrary.managementHostName != ''">
|
||||||
and sar_stand_project_library.management_host_name=#{sarStandProjectLibrary.managementHostName}
|
and sar_stand_project_library.management_host_name=#{sarStandProjectLibrary.managementHostName}
|
||||||
</if>
|
</if>
|
||||||
|
|||||||
Reference in New Issue
Block a user