Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/TzsTwoStaffingMapper.xml

@@ -18,7 +18,7 @@
         <if test="companyDto.useCode != '' and companyDto.useCode != null">
             and use_code like concat('%',#{companyDto.useCode},'%')
         </if>
-        <if test="companyDto.useCode != '' and companyDto.useCode != null">
+        <if test="companyDto.completeNormal != '' and companyDto.completeNormal != null">
             and completeNormal like concat('%',#{companyDto.completeNormal},'%')
         </if>
         <if test='companyDto.ids != null and companyDto.ids.size > 0'> and sequence_nbr in