haozq
/
ah_jjzhgd_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改后台bug

This commit is contained in:
haozq 2024-04-24 17:50:08 +08:00
parent 791a90be64
commit 59cf680b45
5 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/dto/AreaDto.java
View File

@ -27,5 +27,9 @@ public class AreaDto {
private String gtId; private String gtId;
private String areaName;
private String proName;
} }

2
securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceMapper.xml
View File

@ -51,7 +51,7 @@
t_code =#{keyWord} t_code =#{keyWord}
) )
</if> </if>
<if test="keyWord!=null and keyWord!=''"> <if test="onLine!=null and onLine!=''">
and on_line =#{onLine} and on_line =#{onLine}
</if> </if>
</select> </select>

4
securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TaskCheckMapper.xml
View File

@ -43,8 +43,8 @@
<if test='types=="2"'> <if test='types=="2"'>
and tcm.user_id is null and tcm.user_id is null
</if> </if>
<if test='types=="1"'> <if test='type=="1"'>
and tcm.user_id is not null and tcm.user_id!=#{userId} and (tcm.user_id!=#{userId} or tcm.user_id is null )
</if> </if>
<if test="keyWord!=null and keyWord!=''"> <if test="keyWord!=null and keyWord!=''">
AND ( AND (

9
securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TbAreaMapper.xml
View File

@ -64,8 +64,11 @@
left join tb_project pro on pro.bid_code=area.bid_code and pro.del_flag=0 left join tb_project pro on pro.bid_code=area.bid_code and pro.del_flag=0
LEFT JOIN t_pro_gt gt on area.gt_id=gt.gt_id and gt.del_flag=0 LEFT JOIN t_pro_gt gt on area.gt_id=gt.gt_id and gt.del_flag=0
where area.del_flag=0 where area.del_flag=0
<if test="keyWord!=null and keyWord!=''"> <if test="areaName!=null and areaName!=''">
AND INSTR(area_name,#{keyWord}) > 0 AND INSTR(area_name,#{areaName}) > 0
</if>
<if test="proName!=null and proName!=''">
AND INSTR(pro.pro_name,#{proName}) > 0
</if> </if>
</select> </select>
<select id="getProjectTypeByBidCode" resultType="java.lang.String"> <select id="getProjectTypeByBidCode" resultType="java.lang.String">
@ -128,7 +131,7 @@
<select id="getProCostList" resultType="com.securitycontrol.entity.screen.vo.ProCostVo"> <select id="getProCostList" resultType="com.securitycontrol.entity.screen.vo.ProCostVo">
SELECT pro.pro_name proName,tpc.cost ,tpc.remark,tpc.create_time createTime,tpc.id SELECT pro.pro_name proName,tpc.cost ,tpc.remark,tpc.create_time createTime,tpc.id
FROM tb_project_cost tpc FROM tb_project_cost tpc
left join tb_project pro on pro.bid_code=tpc.bid_code left join tb_project pro on pro.bid_code=tpc.bid_code and pro.del_flag=0
where pro.bid_code=#{bidCode} where pro.bid_code=#{bidCode}
</select> </select>

2
securitycontrol-model/securitycontrol-background/src/main/resources/mapper/UserProMapper.xml
View File

@ -63,7 +63,7 @@
FROM tb_project pro FROM tb_project pro
left join sys_build sb on pro.org=sb.org_id left join sys_build sb on pro.org=sb.org_id
left join tb_user_pro tup on tup.bid_cod=pro.bid_code and tup.del_flag=0 left join tb_user_pro tup on tup.bid_cod=pro.bid_code and tup.del_flag=0
WHERE pro.del_flag=0 and (tup.user_id!=4 or tup.user_id is null) WHERE pro.del_flag=0 and (tup.user_id!=#{userId} or tup.user_id is null)
<if test='type=="1"'> <if test='type=="1"'>
AND tup.user_id is null AND tup.user_id is null
</if> </if>