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> ...@@ -262,13 +262,16 @@ public class SysUnitServiceImpl extends ServiceImpl<SysUnitRepository, SysUnit>
} }
//超级管理员 //超级管理员
if (cyInitComp.admin[0].equals(CyUserUtil.getAuthenRoleIds())) { 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())) { if (cyInitComp.unit[0].equals(CyUserUtil.getAuthenRoleIds())) {
return baseMapper.findUnit(userId); return baseMapper.findUnit(userId);
} }
//根据用户id查询当前人的商家信息 （代言人） //根据用户id查询当前人的商家信息 （代言人）
return baseMapper.findUnitByUnit(userId); 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 ...@@ -90,9 +90,9 @@ public class SysUserServiceImpl extends ServiceImpl<AdminSysUserRepository, SysU
throw new CyServiceException(AdminUserInfoExceptionEnums.USERNAME_EXISTS); throw new CyServiceException(AdminUserInfoExceptionEnums.USERNAME_EXISTS);
} }
if (StringUtils.isNotEmpty(sysUser.getPhone())) { // if (StringUtils.isNotEmpty(sysUser.getPhone())) {
throw new CyServiceException(AdminUserInfoExceptionEnums.PHONE_EXISTS); // throw new CyServiceException(AdminUserInfoExceptionEnums.PHONE_EXISTS);
} // }
if (StringUtils.isNotEmpty(sysUser.getIdNumber())) { if (StringUtils.isNotEmpty(sysUser.getIdNumber())) {
throw new CyServiceException(AdminUserInfoExceptionEnums.ID_NUMBER_EXISTS); throw new CyServiceException(AdminUserInfoExceptionEnums.ID_NUMBER_EXISTS);
......
src/main/resources/mapper/business/cmspriceclick/mapper/CmsPriceClickMapper.xml
View file @ 77c7bfbb
...@@ -326,70 +326,79 @@ ...@@ -326,70 +326,79 @@
</select> </select>
<select id="getCmsPriceClickByCircleId" <select id="getCmsPriceClickByCircleId"
resultType="org.rcisoft.business.cmspriceclick.entity.WxUserImageDTO"> resultType="org.rcisoft.business.cmspriceclick.entity.WxUserImageDTO">
SELECT su.`name` as name, SELECT su.`name` as name,
su.username as username, su.username as username,
# su.business_id as , # su.business_id as ,
# su.unit_id, # su.unit_id,
cpcn.clickThroughRate as clickThroughRate, cpcn.clickThroughRate as clickThroughRate,
cpcn.clickThroughRateArticle as clickThroughRateArticle, cpcn.clickThroughRateArticle as clickThroughRateArticle,
cpcv.clickThroughRateVideo as clickThroughRateVideo, cpcv.clickThroughRateVideo as clickThroughRateVideo,
cpcv.clickThroughRateVideoArticle as clickThroughRateVideoArticle cpcv.clickThroughRateVideoArticle as clickThroughRateVideoArticle
FROM (SELECT NAME FROM (SELECT NAME
, ,
username, username,
business_id, business_id,
suu.unit_id suu.unit_id
FROM sys_user su FROM sys_user su
LEFT JOIN sys_user_unit suu ON suu.user_id = su.business_id LEFT JOIN sys_user_unit suu ON suu.user_id = su.business_id
WHERE suu.unit_id = #{wxUserImageDTO.unitId} WHERE 1=1
AND su.identity = 3 <if test="wxUserImageDTO.unitId != null ">
GROUP BY su.username, AND suu.unit_id = #{wxUserImageDTO.unitId}
su.business_id) su </if>
LEFT JOIN (SELECT su.`name`, AND su.identity = 3
su.username, GROUP BY su.username,
su.business_id, su.business_id) su
su.unit_id, LEFT JOIN (SELECT su.`name`,
COUNT(DISTINCT cpcn.news_video_id) clickThroughRate, su.username,
SUM(cpcn.click_through_rate) clickThroughRateArticle su.business_id,
FROM (SELECT NAME su.unit_id,
, COUNT(DISTINCT cpcn.news_video_id) clickThroughRate,
username, SUM(cpcn.click_through_rate) clickThroughRateArticle
business_id, FROM (SELECT NAME
suu.unit_id ,
FROM sys_user su username,
LEFT JOIN sys_user_unit suu ON suu.user_id = su.business_id business_id,
WHERE suu.unit_id = #{wxUserImageDTO.unitId} suu.unit_id
AND su.identity = 3 FROM sys_user su
GROUP BY su.username, LEFT JOIN sys_user_unit suu ON suu.user_id = su.business_id
su.business_id) su WHERE 1=1
LEFT JOIN cms_price_click cpcn ON cpcn.user_id = su.business_id <if test="wxUserImageDTO.unitId != null ">
AND cpcn.unit_id = su.unit_id AND suu.unit_id = #{wxUserImageDTO.unitId}
AND cpcn.type = 0 </if>
AND cpcn.del_flag = 0 AND su.identity = 3
GROUP BY su.business_id) cpcn GROUP BY su.username,
ON cpcn.business_id = su.business_id AND cpcn.unit_id = su.unit_id su.business_id) su
LEFT JOIN (SELECT su.`name`, LEFT JOIN cms_price_click cpcn ON cpcn.user_id = su.business_id
su.username, AND cpcn.unit_id = su.unit_id
su.business_id, AND cpcn.type = 0
su.unit_id, AND cpcn.del_flag = 0
COUNT(DISTINCT cpcv.news_video_id) clickThroughRateVideo, GROUP BY su.business_id) cpcn
SUM(cpcv.click_through_rate) clickThroughRateVideoArticle ON cpcn.business_id = su.business_id AND cpcn.unit_id = su.unit_id
FROM (SELECT NAME LEFT JOIN (SELECT su.`name`,
, su.username,
username, su.business_id,
business_id, su.unit_id,
suu.unit_id COUNT(DISTINCT cpcv.news_video_id) clickThroughRateVideo,
FROM sys_user su SUM(cpcv.click_through_rate) clickThroughRateVideoArticle
LEFT JOIN sys_user_unit suu ON suu.user_id = su.business_id FROM (SELECT NAME
WHERE suu.unit_id = #{wxUserImageDTO.unitId} ,
AND su.identity = 3 username,
GROUP BY su.username, business_id,
su.business_id) su suu.unit_id
LEFT JOIN cms_price_click cpcv ON cpcv.user_id = su.business_id FROM sys_user su
AND cpcv.unit_id = su.unit_id LEFT JOIN sys_user_unit suu ON suu.user_id = su.business_id
AND cpcv.type = 1 WHERE 1=1
AND cpcv.del_flag = 0 <if test="wxUserImageDTO.unitId != null ">
GROUP BY su.business_id) cpcv AND suu.unit_id = #{wxUserImageDTO.unitId}
ON cpcv.business_id = su.business_id AND cpcv.unit_id = su.unit_id </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> </select>
</mapper> </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