Merge remote-tracking branch 'origin/master'

xiangpei

2024-08-31 df6bc44422110fa911c8666dfb4d97dcabb0328b

 ycl-server/src/main/resources/mapper/zgyw/ImageResourceSecurityMapper.xml

@@ -28,7 +28,7 @@
    </sql>

    <select id="selectImageResourceSecurityList" resultType="com.ycl.platform.domain.entity.ImageResourceSecurity">
        select id, a.dept_id, dept_name, platform_online, property_accuracy, weak_password, risk_property, boundary_integrity from t_image_resource_security a
        select id, a.dept_id, area AS deptName, platform_online, property_accuracy, weak_password, risk_property, boundary_integrity from t_image_resource_security a
        LEFT JOIN sys_dept b ON a.dept_id = b.dept_id AND b.del_flag = 0
        <where>
            <if test="platformOnline != null ">and platform_online = #{platformOnline}</if>
@@ -71,7 +71,7 @@
    <insert id="saveBatch">
        insert into t_image_resource_security (dept_id, platform_online, property_accuracy, weak_password, risk_property, boundary_integrity, create_time) VALUES
        <foreach collection="list" item="item" separator=",">
            (#{item.deptId}, #{item.platformOnline}, #{item.propertyAccuracy}, #{item.weakPassword}, #{item.riskProperty}, #{item.boundaryIntegrity}, NOW())
            (#{item.deptId}, #{item.platformOnline}, #{item.propertyAccuracy}, #{item.weakPassword}, #{item.riskProperty}, #{item.boundaryIntegrity}, #{item.createTime})
        </foreach>
    </insert>