Skip to content

I
intel_promotion_api
Commit 77c7bfbb authored by 刘帅阳's avatar 刘帅阳
Browse files
Options

修改bug

parent bffbf87a
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 69 deletions
src/main/java/org/rcisoft/business/sysunit/service/impl/SysUnitServiceImpl.java
View file @ 77c7bfbb
......@@ -262,13 +262,16 @@ public class SysUnitServiceImpl extends ServiceImpl<SysUnitRepository, SysUnit>
}
//超级管理员
if (cyInitComp.admin[0].equals(CyUserUtil.getAuthenRoleIds())) {
return baseMapper.findAllUnit();
List<SysUnit> allUnit = baseMapper.findAllUnit();
SysUnit sysUnit = new SysUnit();
sysUnit.setUnitName("全部");
allUnit.add(sysUnit);
return allUnit;
}
//商家
if (cyInitComp.unit[0].equals(CyUserUtil.getAuthenRoleIds())) {
return baseMapper.findUnit(userId);
}
//根据用户id查询当前人的商家信息 （代言人）
return baseMapper.findUnitByUnit(userId);
}
......
src/main/java/org/rcisoft/business/sysuser/service/impl/SysUserServiceImpl.java
View file @ 77c7bfbb
......@@ -90,9 +90,9 @@ public class SysUserServiceImpl extends ServiceImpl<AdminSysUserRepository, SysU
throw new CyServiceException(AdminUserInfoExceptionEnums.USERNAME_EXISTS);
}
if (StringUtils.isNotEmpty(sysUser.getPhone())) {
throw new CyServiceException(AdminUserInfoExceptionEnums.PHONE_EXISTS);
}
// if (StringUtils.isNotEmpty(sysUser.getPhone())) {
// throw new CyServiceException(AdminUserInfoExceptionEnums.PHONE_EXISTS);
// }
if (StringUtils.isNotEmpty(sysUser.getIdNumber())) {
throw new CyServiceException(AdminUserInfoExceptionEnums.ID_NUMBER_EXISTS);
......
src/main/resources/mapper/business/cmspriceclick/mapper/CmsPriceClickMapper.xml
View file @ 77c7bfbb
......@@ -326,70 +326,79 @@
</select>
<select id="getCmsPriceClickByCircleId"
resultType="org.rcisoft.business.cmspriceclick.entity.WxUserImageDTO">
SELECT su.`name` as name,
su.username as username,
# su.business_id as ,
# su.unit_id,
cpcn.clickThroughRate as clickThroughRate,
cpcn.clickThroughRateArticle as clickThroughRateArticle,
cpcv.clickThroughRateVideo as clickThroughRateVideo,
cpcv.clickThroughRateVideoArticle as clickThroughRateVideoArticle
SELECT su.`name` as name,
su.username as username,
# su.business_id as ,
# su.unit_id,
cpcn.clickThroughRate as clickThroughRate,
cpcn.clickThroughRateArticle as clickThroughRateArticle,
cpcv.clickThroughRateVideo as clickThroughRateVideo,
cpcv.clickThroughRateVideoArticle as clickThroughRateVideoArticle
FROM (SELECT NAME
,
username,
business_id,
suu.unit_id
FROM sys_user su
LEFT JOIN sys_user_unit suu ON suu.user_id = su.business_id
WHERE suu.unit_id = #{wxUserImageDTO.unitId}
AND su.identity = 3
GROUP BY su.username,
su.business_id) su
LEFT JOIN (SELECT su.`name`,
su.username,
su.business_id,
su.unit_id,
COUNT(DISTINCT cpcn.news_video_id) clickThroughRate,
SUM(cpcn.click_through_rate) clickThroughRateArticle
FROM (SELECT NAME
,
username,
business_id,
suu.unit_id
FROM sys_user su
LEFT JOIN sys_user_unit suu ON suu.user_id = su.business_id
WHERE suu.unit_id = #{wxUserImageDTO.unitId}
AND su.identity = 3
GROUP BY su.username,
su.business_id) su
LEFT JOIN cms_price_click cpcn ON cpcn.user_id = su.business_id
AND cpcn.unit_id = su.unit_id
AND cpcn.type = 0
AND cpcn.del_flag = 0
GROUP BY su.business_id) cpcn
ON cpcn.business_id = su.business_id AND cpcn.unit_id = su.unit_id
LEFT JOIN (SELECT su.`name`,
su.username,
su.business_id,
su.unit_id,
COUNT(DISTINCT cpcv.news_video_id) clickThroughRateVideo,
SUM(cpcv.click_through_rate) clickThroughRateVideoArticle
FROM (SELECT NAME
,
username,
business_id,
suu.unit_id
FROM sys_user su
LEFT JOIN sys_user_unit suu ON suu.user_id = su.business_id
WHERE suu.unit_id = #{wxUserImageDTO.unitId}
AND su.identity = 3
GROUP BY su.username,
su.business_id) su
LEFT JOIN cms_price_click cpcv ON cpcv.user_id = su.business_id
AND cpcv.unit_id = su.unit_id
AND cpcv.type = 1
AND cpcv.del_flag = 0
GROUP BY su.business_id) cpcv
ON cpcv.business_id = su.business_id AND cpcv.unit_id = su.unit_id
,
username,
business_id,
suu.unit_id
FROM sys_user su
LEFT JOIN sys_user_unit suu ON suu.user_id = su.business_id
WHERE 1=1
<if test="wxUserImageDTO.unitId != null ">
AND suu.unit_id = #{wxUserImageDTO.unitId}
</if>
AND su.identity = 3
GROUP BY su.username,
su.business_id) su
LEFT JOIN (SELECT su.`name`,
su.username,
su.business_id,
su.unit_id,
COUNT(DISTINCT cpcn.news_video_id) clickThroughRate,
SUM(cpcn.click_through_rate) clickThroughRateArticle
FROM (SELECT NAME
,
username,
business_id,
suu.unit_id
FROM sys_user su
LEFT JOIN sys_user_unit suu ON suu.user_id = su.business_id
WHERE 1=1
<if test="wxUserImageDTO.unitId != null ">
AND suu.unit_id = #{wxUserImageDTO.unitId}
</if>
AND su.identity = 3
GROUP BY su.username,
su.business_id) su
LEFT JOIN cms_price_click cpcn ON cpcn.user_id = su.business_id
AND cpcn.unit_id = su.unit_id
AND cpcn.type = 0
AND cpcn.del_flag = 0
GROUP BY su.business_id) cpcn
ON cpcn.business_id = su.business_id AND cpcn.unit_id = su.unit_id
LEFT JOIN (SELECT su.`name`,
su.username,
su.business_id,
su.unit_id,
COUNT(DISTINCT cpcv.news_video_id) clickThroughRateVideo,
SUM(cpcv.click_through_rate) clickThroughRateVideoArticle
FROM (SELECT NAME
,
username,
business_id,
suu.unit_id
FROM sys_user su
LEFT JOIN sys_user_unit suu ON suu.user_id = su.business_id
WHERE 1=1
<if test="wxUserImageDTO.unitId != null ">
AND suu.unit_id = #{wxUserImageDTO.unitId}
</if>
AND su.identity = 3
GROUP BY su.username,
su.business_id) su
LEFT JOIN cms_price_click cpcv ON cpcv.user_id = su.business_id
AND cpcv.unit_id = su.unit_id
AND cpcv.type = 1
AND cpcv.del_flag = 0
GROUP BY su.business_id) cpcv
ON cpcv.business_id = su.business_id AND cpcv.unit_id = su.unit_id
</select>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment