jczz_manager.git

			@@ -275,7 +275,8 @@
			LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jh.house_code
			LEFT JOIN jczz_grid_range jgr on jgr.house_code=jda.address_code
			LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0
			<where>
			where jh.is_deleted = 0
			and jh.name != '' and jh.name is not null
			<if test="household.userId!=null">
			AND jg.id IN ( SELECT DISTINCT jgm.grid_id FROM jczz_gridman jgm WHERE jgm.user_id = #{household.userId}
			)
			@@ -316,9 +317,7 @@
			<if test="household.id!=null and household.id!=''">
			and jh.id = #{household.id}
			</if>
			and jh.is_deleted = 0
			order by jh.create_time desc
			</where>
			</select>


			@@ -364,7 +363,8 @@
			select
			jh.id,jh.house_code,jh.name,jh.phone_number,jh.associated_user_id,
			jh.role_type,jh.associated_user_name,jh.relationship,jh.is_primary_contact,
			jh.residential_status,jh.gender,jh.birthday,jh.id_card,jh.card_type,jh.hkmt_pass,jh.passport,
			jh.residential_status,jh.gender,jh.birthday,jh.id_card,
			jh.card_type,jh.card_no,jh.hkmt_pass,jh.passport,
			jh.ethnicity,jh.education,jh.resident_type,
			jh.hukou_registration,jh.resident_adcode,jh.native_place_adcode,
			jh.religious_belief,jh.health_status,jh.disease_name,
			@@ -699,7 +699,7 @@
			<if test="household.regionCode!=null and household.regionCode!=''">
			and jg.community_code like concat('%',#{household.regionCode},'%')
			</if>
			<if test="household.id!=null and household.id!=''">
			<if test="household.id!=null">
			and jh.id = #{household.id}
			</if>
			<if test="household.labelId!=null">
			@@ -709,7 +709,11 @@
			and CONCAT(jh.name,jh.phone_number) like CONCAT ('%', #{household.searchKey},'%')
			</if>
			and jh.is_deleted = 0
			order by jh.create_time desc
			and jh.name != '' and jh.name is not null
			order by jh.create_time desc,jh.id desc
			<if test="household.limit!=null">
			limit #{household.limit}
			</if>
			</where>
			</select>