Merge remote-tracking branch 'origin/master'

jiangping

2024-11-14 03e3f933f10fb9228eef02c5699b749a501a50e7

 server/system_service/src/main/resources/mappers/SystemUserMapper.xml

@@ -75,8 +75,8 @@
      <if test="dto.companyType != null ">
        AND  sd.`type` = #{dto.companyType}
      </if>
      <if test="dto.querySpecial != null and dto.querySpecial = 1 ">
            AND find_in_set(#{dto.companySpecialId},REPLACE(sd.company_path,"/",","))
      <if test="dto.querySpecial != null and dto.querySpecial == 1 ">
            AND find_in_set(#{dto.companySpecialId},REPLACE(sd.company_path,'/',','))
      </if>
    </where>
    ${orderByClause}