--no commit message

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

@@ -14,7 +14,8 @@ import com.zrqx.core.vo.member.bg.distributor.DistributorListVO;
 @Mapper
 public interface DistributorMapper extends BaseMapper<Distributor> {
 
-	@Select("<script> SELECT DISTINCT d.*   ,memberNum "
+	@Select("<script> "
+			+ " SELECT DISTINCT d.*   ,memberNum "
 			+ " FROM distributor d  ,(SELECT o.*,COUNT(om.id) memberNum FROM m_organ o LEFT JOIN m_organ_member om ON o.id = om.oid  GROUP BY om.oid ) oom "
 			+ " WHERE d.code = oom.code "
 			+ " LIKE(d.name,form.name) "

app/member/src/main/java/com/zrqx/member/bg/emember/mapper/ExpertMemberMapper.java

 package com.zrqx.member.bg.emember.mapper;
 
 import org.apache.ibatis.annotations.Select;
-
+import org.apache.ibatis.annotations.Param;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.member.ExpertMember;
 import com.zrqx.core.vo.member.bg.member.EMemberVO;
 
 public interface ExpertMemberMapper extends BaseMapper<ExpertMember>{
-	@Select("select m.id,account,nickName,phone,status,email,remark,authorId,name,organName,sex,img from m_Member m "
-			+ "left join m_Expert_Member em "
-			+ "on m.id = em.id "
-			+ "where m.id = #{id}")
-	public EMemberVO getById(Integer id);
+	@Select("<script>"
+			+ " select m.id,account,nickName,phone,status,email,remark,authorId,name,organName,sex,img from m_Member m "
+			+ " left join m_Expert_Member em "
+			+ " on m.id = em.id "
+			+ " where 1=1 "
+			+ " eq(m.id,id) "
+			+ "</script>")
+	public EMemberVO getById(@Param("id")Integer id);
 }

app/member/src/main/java/com/zrqx/member/bg/member/mapper/MemberMapper.java

@@ -14,32 +14,39 @@ import com.zrqx.core.vo.member.bg.pm.PmMemberListVO;
 
 public interface MemberMapper extends BaseMapper<Member>{
 	
-	@Select("<script> select m.id,account,status,phone,level,a.balance,createTime "
-			+ "from m_member m left join m_assets a "
-			+ "on m.id = a.id "
-			+ "where status != 2 and level = 0 "
-			+ "<if test = '"+NOTBLANK+"(account)' >"
-			+ " and m.account like concat(#{account},'%') "
-			+ "</if>"
-			+ "<if test = '"+NOTBLANK+"(phone)' >"
-			+ " and m.phone like concat(#{phone},'%') "
-			+ "</if>"
-			+ "<if test = 'status != null' >"
-			+ " and m.status = #{status} "
-			+ "</if>"
-			+ "<if test = '"+NOTBLANK+"(beginTime)' >"
+	String DEFAULT_PARAM = " like(m.account,form.account) "
+			+ " like(m.phone,form.phone) "
+			+ " eq(m.status,form.status) "
+			
+			+ "<if test = '"+NOTBLANK+"(form.beginTime)' >"
 			+ "<![CDATA["
-			+ " and date_format(m.createTime,'%Y-%m-%d') >= #{beginTime} "
+			+ " and date_format(m.createTime,'%Y-%m-%d') >= #{form.beginTime} "
 			+ "]]>"
 			+ "</if>"
-			+ "<if test = '"+NOTBLANK+"(endTime)' >"
+			+ "<if test = '"+NOTBLANK+"(form.endTime)' >"
 			+ "<![CDATA["
-			+ " and date_format(m.createTime,'%Y-%m-%d') <= #{endTime} "
+			+ " and date_format(m.createTime,'%Y-%m-%d') <= #{form.endTime} "
 			+ "]]>"
-			+ "</if>"
+			+ "</if>";
+	
+	String DEFAULT_SQL = " select m.id,account,status,phone,level,a.balance,createTime "
+			+ " from m_member m left join m_assets a "
+			+ " on m.id = a.id "
+			+ " where status != 2 and level = 0 ";
+	
+	@Select("<script> "
+			+ DEFAULT_SQL
+			
+			+ DEFAULT_PARAM
+			
 			+ "</script>")
-	public List<MemberListVO> page(QueryMemberForm form);
-	@Select("<script> select id,account,status,phone,level,createTime from m_member m"
+	public List<MemberListVO> page(@Param("form")QueryMemberForm form);
+	
+	
+	
+	
+	@Select("<script> "
+			+ " select id,account,status,phone,level,createTime from m_member m "
 			+ " where status = 1 "
 			+ "<if test = '"+NOTBLANK+"(a2p)' >"
 			+ " and (m.account like concat(#{a2p},'%') or m.phone like concat(#{a2p},'%'))"
@@ -53,40 +60,25 @@ public interface MemberMapper extends BaseMapper<Member>{
 	 * @param account
 	 * @return
 	 */
-	@Select("<script>select count(id) from m_member "
-			+ "where account =#{account} "
-			+ "<if test = 'id != null' >"
-			+ " and id != #{id} "
-			+ "</if>"
+	@Select("<script>"
+			+ " select count(id) from m_member m "
+			+ " where 1=1 "
+			+ " eq(m.account,account) "
+			+ " eq(m.id,id) "
 			+ "</script>")
 	public int isExist(@Param("id")Integer id,@Param("account")String account);
 	
-	@Select("<script> select m.id,account,status,phone,level,a.balance,createTime "
-			+ "from m_member m left join m_assets a "
-			+ "on m.id = a.id "
-			+ "where status != 2 and level = 0 "
-			+ "<if test = '"+NOTBLANK+"(account)' >"
-			+ " and m.account like concat(#{account},'%') "
-			+ "</if>"
-			+ "<if test = '"+NOTBLANK+"(phone)' >"
-			+ " and m.phone like concat(#{phone},'%') "
-			+ "</if>"
-			+ "<if test = 'status != null' >"
-			+ " and m.status = #{status} "
-			+ "</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>"
+	
+	
+	@Select("<script> "
+			
+			+ DEFAULT_SQL
+			
+			+ DEFAULT_PARAM
+			
 			+ " order by createTime desc "
 			+ "</script>")
-	public List<ExcelMemberExportVo> list(QueryMemberForm query);
+	public List<ExcelMemberExportVo> list(@Param("form")QueryMemberForm query);
 	
 	/**
 	 * 判断 手机号是否已存在
@@ -94,11 +86,11 @@ public interface MemberMapper extends BaseMapper<Member>{
 	 * @param account
 	 * @return
 	 */
-	@Select("<script>select count(id) from m_member "
-			+ "where phone =#{phone} "
-			+ "<if test = 'id != null' >"
-			+ " and id != #{id} "
-			+ "</if>"
+	@Select("<script>"
+			+ " select count(id) from m_member m "
+			+ " where 1=1 "
+			+ " eq(m.phone,phone) "
+			+ " eq(m.id,id) "
 			+ "</script>")
 	public int isExistPhone(@Param("id")Integer id,@Param("phone")String phone);
 }

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

@@ -2,9 +2,9 @@ package com.zrqx.member.bg.omember.mapper;
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
-import com.zrqx.core.form.member.bg.member.QueryMemberForm;
 import com.zrqx.core.form.member.bg.omember.QueryOrganMemberForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.member.OrganMember;
@@ -13,72 +13,94 @@ import com.zrqx.core.vo.member.bg.member.OrganMemberListVO;
 import com.zrqx.core.vo.member.bg.member.OrganMemberVO;
 
 public interface OrganMemberMapper extends BaseMapper<OrganMember>{
-	@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}")
-	public OrganMemberVO getById(Integer id);
-	@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)' >"
+	
+	
+	String DEFAULT_PARAM = " 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 "
+			
+			+ " like(m.account,form.account) "
+			+ " like(o.name,form.name) "
+			+ " eq(m.status,form.status) "
+			+ " eq(o.type,form.type) "
+			
+			+ "<if test = '"+NOTBLANK+"(form.beginTime)' >"
 			+ "<![CDATA["
-			+ " and date_format(m.createTime,'%Y-%m-%d') >= #{beginTime} "
+			+ " and date_format(m.createTime,'%Y-%m-%d') >= #{form.beginTime} "
 			+ "]]>"
 			+ "</if>"
-			+ "<if test = '"+NOTBLANK+"(endTime)' >"
+			+ "<if test = '"+NOTBLANK+"(form.endTime)' >"
 			+ "<![CDATA["
-			+ " and date_format(m.createTime,'%Y-%m-%d') <= #{endTime} "
+			+ " and date_format(m.createTime,'%Y-%m-%d') <= #{form.endTime} "
 			+ "]]>"
-			+ "</if>"
+			+ "</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 "
+			+ " left join m_Organ_Member om "
+			+ " on m.id = om.id "
+			+ " left join m_Organ o "
+			+ " on om.oid = o.id "
+			+ " where 1=1 "
+			+ " eq(m.id,id) "
 			+ "</script>")
-	public List<OrganMemberListVO> page(QueryOrganMemberForm form);
+			
+	public OrganMemberVO getById(@Param("id")Integer id);
 	
-	@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>"
+	
+	
+	
+//	@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> "
+			+ DEFAULT_PARAM
+			+ "</script>")
+	public List<OrganMemberListVO> page(@Param("form")QueryOrganMemberForm form);
+	
+	
+	
+	@Select("<script> "
+			+ DEFAULT_PARAM
 			+ "</script>")
 	public List<ExcelOrganMemberExportVo> list(QueryOrganMemberForm query);
 }

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

@@ -2,6 +2,7 @@ package com.zrqx.member.bg.pm.mapper;
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import com.zrqx.core.mapper.BaseMapper;
@@ -15,6 +16,13 @@ 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}")
-	public List<String> getAccountList(Integer pmid);
+	//@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 "
+			+ " m_member m "
+			+ " join m_private_message_member pmm on m.id = pmm.memberId "
+			+ " and pmid = #{pmid} "
+			+ "</script>")
+	public List<String> getAccountList(@Param("pmid")Integer pmid);
 }

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

 package com.zrqx.member.bg.pmember.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import com.zrqx.core.mapper.BaseMapper;
@@ -7,9 +8,19 @@ 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}")
-	public PMemberVO getById(Integer id);
+//	@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>"
+			+ " 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 1=1 "
+			+ " eq(m.id,id) "
+			+ "</script>")
+	public PMemberVO getById(@Param("id")Integer id);
 }

app/member/src/main/java/com/zrqx/member/fg/member/mapper/FgMemberMapper.java

@@ -15,17 +15,26 @@ public interface FgMemberMapper extends BaseMapper<Member>{
 	 * @param phone
 	 * @return
 	 */
-	@Select("<script>select count(id) from m_member "
-			+ "where 1=1 "
-			+ "<if test = '"+NOTBLANK+"(account)' >"
-			+ " and account = #{account} "
-			+ "</if>"
-			+ "<if test = 'id != null' >"
-			+ " and id != #{id} "
-			+ "</if>"
-			+ "<if test = '"+NOTBLANK+"(phone)' >"
-			+ " and phone = #{phone} "
-			+ "</if>"
+//	@Select("<script>select count(id) from m_member "
+//			+ "where 1=1 "
+//			+ "<if test = '"+NOTBLANK+"(account)' >"
+//			+ " and account = #{account} "
+//			+ "</if>"
+//			+ "<if test = 'id != null' >"
+//			+ " and id != #{id} "
+//			+ "</if>"
+//			+ "<if test = '"+NOTBLANK+"(phone)' >"
+//			+ " and phone = #{phone} "
+//			+ "</if>"
+//			+ "</script>")
+//	
+	
+	@Select("<script>"
+			+ " select count(id) from m_member m "
+			+ " where 1=1 "
+			+ " eq(m.account,account) "
+			+ " eq(m.id,id) "
+			+ " eq(m.phone,phone) "
 			+ "</script>")
 	public int isExist(@Param("id")Integer id,@Param("account")String account,@Param("phone")String phone);
 }

app/member/src/main/java/com/zrqx/member/fg/permissions/FgPermissionsController.java

@@ -309,9 +309,11 @@ public class FgPermissionsController {
 		if (!form.getCode().toLowerCase().equals(redisCode.toLowerCase())) {
 			throw new BaseException(3,"验证码有误");
 		}
-		if(StringUtils.isBlank(form.getQqKey()) && StringUtils.isBlank(form.getWechatKey())) {
-			throw new BaseException(9,"第三方账号不能为空");
-		}
+		
+		  if(StringUtils.isBlank(form.getQqKey()) &&
+		  StringUtils.isBlank(form.getWechatKey())) { throw new
+		  BaseException(9,"第三方账号不能为空"); }
+		 
 		redis.delete(form.getPhone());
 		if(mService.isExistByAccount(null,form.getAccount())) {
 			throw new BaseException(99,"已被注册");

app/member/src/main/java/com/zrqx/member/fg/pm/mapper/FgPrivateMessageMapper.java

@@ -12,9 +12,18 @@ import com.zrqx.core.vo.member.fg.pm.FgPrivateMessageListVO;
  * 站内信
  */
 public interface FgPrivateMessageMapper extends BaseMapper<PrivateMessage>{
-	@Select("select pm.id,pmm.id pmmId,title,content,sendTime "
+//	@Select("select pm.id,pmm.id pmmId,title,content,sendTime "
+//			+ "from m_private_message_member pmm left join m_private_message pm "
+//			+ "on pm.id = pmm.pmid "
+//			+ "where memberId = #{memberId}  and status !=2")
+	
+	
+	@Select("<script>"
+			+ "select pm.id,pmm.id pmmId,title,content,sendTime "
 			+ "from m_private_message_member pmm left join m_private_message pm "
 			+ "on pm.id = pmm.pmid "
-			+ "where memberId = #{memberId}  and status !=2")
+			+ " where 1=1 and status !=2 "
+			+ " eq(pmm.memberId,memberId) "
+			+ "</script>")
 	List<FgPrivateMessageListVO> page(@Param("memberId")Integer memberId);
 }

pom.xml

@@ -113,6 +113,7 @@
 		</dependencies>
 	</dependencyManagement>
 	<build>
+		<defaultGoal>compile</defaultGoal>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>