From c981d74612bf35c16365aba0db9b55be0ad81dac Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Wed, 04 Nov 2020 16:48:45 +0800
Subject: [PATCH] 将充值记录的数据权限放开
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderRecordServiceImpl.java | 4 ++--
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderRecordMapper.xml | 27 +++++++++++++++------------
2 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderRecordServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderRecordServiceImpl.java
index 113e57d..775c24e 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderRecordServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderRecordServiceImpl.java
@@ -80,8 +80,8 @@
@Override
public PageResult<ProductOrderJoinDetail> findAllList(Map<String, Object> params, SysUser sysUser) {
Page<ProductOrderJoinDetail> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
- Map<String, Object> roleOrgMap = roleOrganizationService.getRoleOrgMap(sysUser);
- params.putAll(roleOrgMap);
+// Map<String, Object> roleOrgMap = roleOrganizationService.getRoleOrgMap(sysUser);
+// params.putAll(roleOrgMap);
List<ProductOrderJoinDetail> list = baseMapper.findAllList(page, params);
for (ProductOrderJoinDetail productOrderJoinDetail : list) {
Date proBegintime = productOrderJoinDetail.getProBegintime();
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderRecordMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderRecordMapper.xml
index 9c562d2..029dfb8 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderRecordMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderRecordMapper.xml
@@ -136,7 +136,7 @@
</if>
<if test="!itemto.flag">
- or ( is_del = 0 and enabled=1) <include refid="where_condition"></include>
+ or ( DE.is_del = 0 and DE.enabled=1) <include refid="where_condition"></include>
</if>
</when>
<when test="inx==2">
@@ -144,48 +144,48 @@
AND
<foreach item="itemtoto" collection="itemto.object" separator="or" open="(" close=")"
index="">
- create_user_org_code = #{itemtoto.orgCode}
+ DE.create_user_org_code = #{itemtoto.orgCode}
</foreach>
</if>
<if test="!itemto.flag">
or (
<foreach item="itemtoto" collection="itemto.object" separator="or" open="(" close=")"
index="">
- create_user_org_code = #{itemtoto.orgCode}
+ DE.create_user_org_code = #{itemtoto.orgCode}
</foreach>
- and is_del = 0 and enabled=1 <include refid="where_condition"></include>
+ and DE.is_del = 0 and DE.enabled=1 <include refid="where_condition"></include>
)
</if>
</when>
<when test="inx == 3">
<if test="itemto.flag">
AND
- create_user_org_code = #{itemto.object}
+ DE.create_user_org_code = #{itemto.object}
</if>
<if test="!itemto.flag">
- or (create_user_org_code = #{itemto.object} and is_del = 0 and enabled=1) <include refid="where_condition"></include>
+ or (DE.create_user_org_code = #{itemto.object} and DE.is_del = 0 and DE.enabled=1) <include refid="where_condition"></include>
</if>
</when>
<when test="inx == 4">
<if test="itemto.flag">
AND
- create_user_org_code like '${itemto.object}%'
+ DE.create_user_org_code like '${itemto.object}%'
</if>
<if test="!itemto.flag">
- or (create_user_org_code like '${itemto.object}%' and is_del = 0 and enabled=1) <include refid="where_condition"></include>
+ or (DE.create_user_org_code like '${itemto.object}%' and DE.is_del = 0 and DE.enabled=1) <include refid="where_condition"></include>
</if>
</when>
<when test="inx == 5">
<if test="itemto.flag">
AND
- create_user_id = #{itemto.object}
+ DE.create_user_id = #{itemto.object}
</if>
<if test="!itemto.flag">
- or (create_user_id = #{itemto.object} and is_del = 0 and enabled=1) <include refid="where_condition"></include>
+ or (DE.create_user_id = #{itemto.object} and DE.is_del = 0 and DE.enabled=1) <include refid="where_condition"></include>
</if>
</when>
<otherwise>
- AND id is null
+ AND DE.id is null
</otherwise>
</choose>
</foreach>
@@ -215,7 +215,10 @@
FROM
product_order_record DE
LEFT JOIN product_order PRO ON DE.order_id = PRO.id
- <include refid="wherelimit"/>
+ <where>
+ <include refid="where_condition"/>
+ </where>
+
order by DE.id desc
</select>
<select id="groupProductDetail" resultType="com.kidgrow.oprationcenter.vo.GroupProductDetail">
--
Gitblit v1.8.0