--no commit message

app/member/src/main/java/com/zrqx/member/bg/distributor/mapper/DistributorMapper.java

@@ -21,19 +21,9 @@ public interface DistributorMapper extends BaseMapper<Distributor> {
 			+ " LIKE(d.name,form.name) "
 			+ " eq(d.type,form.type) "
 			+ " LIKE(d.code,form.code) "
-			
-//			+ "<if test = '"+NOTBLANK+"(name)' >"
-//			+ " and d.name like concat('%',#{name},'%') "
-//			+ "</if>"
-//			+ "<if test = 'type != null' >"
-//			+ " and d.type = #{type} "
-//			+ "</if>"
 			+ "<if test = '"+NOTBLANK+"(form.contactsOrInformation)' >"
 			+ " and (d.contacts like concat('%',#{form.contactsOrInformation},'%') or d.contactInformation like concat('%',#{form.contactsOrInformation},'%')) "
 			+ "</if>"
-//			+ "<if test = '"+NOTBLANK+"(code)' >"
-//			+ " and d.code like concat('%',#{code},'%') "
-//			+ "</if>"
 			+ "</script>")
 	public List<DistributorListVO> page(@Param("form") QueryDistributorForm form);
 	

app/member/src/main/java/com/zrqx/member/bg/omember/mapper/OrganMemberMapper.java

@@ -39,12 +39,7 @@ public interface OrganMemberMapper extends BaseMapper<OrganMember>{
 			+ "</if>";
 	
 	
-	//@Select("select m.id,account,status,name,type,m.createTime,endTime,relatedResourceTypes from m_Member m "
-	//		+ "left join m_Organ_Member om "
-	//		+ "on m.id = om.id "
-	//		+ "left join m_Organ o "
-	//		+ "on om.oid = o.id "
-	//		+ "where m.id = #{id}")
+	
 	
 	@Select("<script>"
 			+ " select m.id,account,status,name,type,m.createTime,endTime,relatedResourceTypes from m_Member m "
@@ -61,35 +56,7 @@ public interface OrganMemberMapper extends BaseMapper<OrganMember>{
 	
 	
 	
-//	@Select("<script> SELECT m.id,m.account,m.status,o.name,o.type,m.createTime,o.endTime from m_Organ_Member om "
-//			+ "left join m_member m "
-//			+ "on m.id = om.id "
-//			+ "left join m_Organ o "
-//			+ "on om.oid = o.id "
-//			+ " where  status != 2"
-//			+ "<if test = '"+NOTBLANK+"(account)' >"
-//			+ " and m.account like concat(#{account},'%') "
-//			+ "</if>"
-//			+ "<if test = '"+NOTBLANK+"(name)' >"
-//			+ " and o.name like concat(#{name},'%') "
-//			+ "</if>"
-//			+ "<if test = 'status != null' >"
-//			+ " and m.status = #{status} "
-//			+ "</if>"
-//			+ "<if test = 'type != null' >"
-//			+ " and o.type = #{type} "
-//			+ "</if>"
-//			+ "<if test = '"+NOTBLANK+"(beginTime)' >"
-//			+ "<![CDATA["
-//			+ " and date_format(m.createTime,'%Y-%m-%d') >= #{beginTime} "
-//			+ "]]>"
-//			+ "</if>"
-//			+ "<if test = '"+NOTBLANK+"(endTime)' >"
-//			+ "<![CDATA["
-//			+ " and date_format(m.createTime,'%Y-%m-%d') <= #{endTime} "
-//			+ "]]>"
-//			+ "</if>"
-//			+ "</script>")
+
 	
 	
 	@Select("<script> "

app/member/src/main/java/com/zrqx/member/bg/pm/mapper/PmMemberMapper.java

@@ -16,7 +16,7 @@ public interface PmMemberMapper extends BaseMapper<PmMember>{
 	 * @param pmid
 	 * @return
 	 */
-	//@Select("select account from m_member m join m_private_message_member pmm on m.id = pmm.memberId and pmid = #{pmid}")
+	
     @Select("<script>"
 			+ " select account "
 			+ " from "

app/member/src/main/java/com/zrqx/member/bg/pmember/mapper/PersonalMemberMapper.java

@@ -8,10 +8,7 @@ import com.zrqx.core.model.member.PersonalMember;
 import com.zrqx.core.vo.member.bg.member.PMemberVO;
 
 public interface PersonalMemberMapper extends BaseMapper<PersonalMember>{
-//	@Select("select m.id,account,nickName,phone,status,email,remark,title,dept,academic,name,organName,sex,img,password from m_Member m "
-//			+ "left join m_Personal_Member pm "
-//			+ "on m.id = pm.id "
-//			+ "where m.id = #{id}")
+
 	
 	
 	@Select("<script>"