Browse Source

我的个人客户列表、客户管理-个人客户查询、个人客户查询显示BUG修复

anderx 8 years ago
parent
commit
0caa5e8527

+ 3 - 1
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -31,7 +31,7 @@
 		left join industry_category c on b.industry = c.id
 		left join admin d on a.aid = d.id 		
 		where a.type = 0  and a.status != 1 and a.audit_status = 1	
-		AND b.expert_audit=2
+		AND a.audit_status=1
 		<if test="aid != null and aid !=''">
 			and a.aid = #{aid,jdbcType=VARCHAR}
 		</if>
@@ -912,6 +912,8 @@
 		left join admin d on a.aid = d.id
 		LEFT JOIN department_management dm on dm.id = d.department_id 		
 		where a.type = 0  and a.status != 1 and a.audit_status = 1
+		AND a.audit_status=1
+		and a.share_type =0
 		<if test="aid != null and aid !=''">
 			and (a.aid = #{aid,jdbcType=VARCHAR} or d.department_id=(select department_id from admin where id=#{aid,jdbcType=VARCHAR}))
 		</if>

+ 3 - 1
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -97,7 +97,7 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 	@Override
 	public Pagination<CustomerListOut> listPublicPersonalCustomer(CustomerListIn cli, Integer pageNo,Integer pageSize) {
 		cli.setType(AFTConstants.USER_TYPE_PERSONAL);
-		/*cli.setAid(TokenManager.getAdminId());*/
+		cli.setAid(TokenManager.getAdminId());
 		cli.setShareType(String.valueOf(AFTConstants.USER_SHARE_PUBLIC));
 		Map<String,Object> params = disposeParams(cli);
 		@SuppressWarnings("unchecked")
@@ -108,6 +108,8 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 	@Override
 	public Pagination<CustomerListOut> listAllPersonalCustomer(CustomerListIn cli, Integer pageNo, Integer pageSize) {
 		cli.setType(AFTConstants.USER_TYPE_PERSONAL);
+		cli.setAid(TokenManager.getAdminId());
+		cli.setShareType(String.valueOf(AFTConstants.USER_SHARE_PRIVATE));
 		Map<String,Object> params = disposeParams(cli);
 		if(null!=cli.getExpertAudit())params.put("expertAudit", cli.getExpertAudit());
 		@SuppressWarnings("unchecked")