Merge remote-tracking branch 'origin/master'

田源

2023-08-09 2c3c80532a7dcb6e2d8e31162a17c8a1271a5385

 Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/StrategyMapper.xml

@@ -95,7 +95,7 @@
        FROM PL_SYS_PWDSTRATEGY PSS
              LEFT JOIN PL_SYS_USER_PWDSTRATEGY PSUP ON PSS.ID=PSUP.PWDSTRATEGY_ID
              LEFT JOIN PL_ORG_USER POU ON POU.ID=PSUP.USER_ID
        WHERE POU.TENANT_ID = #{tenantId} AND POU.NAME=#{name};
        WHERE POU.TENANT_ID = #{tenantId} AND POU.ACCOUNT=#{name} AND POU.IS_DELETED = 0;
    </select>

    <select id="queryByUserId" resultMap="StrategyMap">