feat(tzs): 增加企业信息查询和用户信息查询功能

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-api/src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml

@@ -130,8 +130,15 @@
 					test="tzBaseEnterpriseInfoDto.address!=null and tzBaseEnterpriseInfoDto.address!='' ">
 				AND address LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.address},'%')
 			</if>
-			<if test="tzBaseEnterpriseInfoDto.regulatoryLabels!=null and tzBaseEnterpriseInfoDto.regulatoryLabels!='' ">
-				AND regulatory_labels  LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.regulatoryLabels},'%')
+			<if test="tzBaseEnterpriseInfoDto.regulatoryLabels != null and tzBaseEnterpriseInfoDto.regulatoryLabels != ''">
+				<choose>
+					<when test='tzBaseEnterpriseInfoDto.regulatoryLabels != "0"'>
+						AND regulatory_labels LIKE CONCAT('%', #{tzBaseEnterpriseInfoDto.regulatoryLabels}, '%')
+					</when>
+					<otherwise>
+						AND regulatory_labels IS NULL
+					</otherwise>
+				</choose>
 			</if>
 
 			<if test="orgCodeList != null and !orgCodeList.isEmpty()">

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

@@ -310,6 +310,7 @@
         u.certificate_num,
         u.identification as identificationStr,
         e.use_unit,
+        u.post_name,
         u.sub_post_name,
         u.new_post as post,
         u.sequence_nbr as uid,
@@ -358,6 +359,9 @@
             <if test="filter.fullAddress != null and filter.fullAddress != ''">
                 and (a.fullAddress like concat('%',#{filter.fullAddress},'%'))
             </if>
+            <if test="filter.permissionStatus != null and filter.permissionStatus != ''">
+                and (a.permissionStatus like concat('%',#{filter.permissionStatus},'%'))
+            </if>
         </where>
         order by
         <if test="sort != null">