|
@@ -204,7 +204,7 @@
|
|
|
(
|
|
|
CASE WHEN b.userID = 0 THEN ''
|
|
|
WHEN u.userIdentity = 2 THEN c.sname
|
|
|
- WHEN u.userIdentity = 4 THEN IF(c.sname=u.userName,c.sname,'')
|
|
|
+ WHEN u.userIdentity = 4 THEN IF(c.sname != u.userName,c.sname,'')
|
|
|
END)AS corporateName,
|
|
|
(
|
|
|
CASE WHEN b.userID = 0 THEN ''
|
|
@@ -236,7 +236,7 @@
|
|
|
LEFT JOIN shop s ON b.userID = s.userID
|
|
|
LEFT JOIN cm_roos_information cri ON b.IP = cri.IP
|
|
|
WHERE b.IP != '106.55.202.118' AND b.delFlag = 0 AND b.accessDate = #{accessDate}
|
|
|
- GROUP BY b.IP, b.accessDate,b.userID ORDER BY b.accessTime DESC
|
|
|
+ GROUP BY b.IP, b.accessDate,b.userID, b.behaviorType ORDER BY b.accessTime DESC
|
|
|
</select>
|
|
|
</mapper>
|
|
|
|