zhijiezhao 5 днів тому
батько
коміт
a16425d2da

+ 1 - 1
src/main/resources/mappings/modules/user/NewCmClubMapper.xml

@@ -105,7 +105,7 @@
         LEFT JOIN (SELECT userID, customerValue FROM cm_organ_value_system WHERE stage = 0 AND delType = 1) covs ON a.userID = covs.userID
         LEFT JOIN (SELECT userID, activeState FROM cm_organ_active_system WHERE stage = 0 AND delType = 1) AS coas ON coas.userID = a.userID
         <where>
-            (u.userOrganizeID IN(0,1) or u.clubStatus != 92) and u.userOrganizeID != 4 AND u.userIdentity != 8
+            (u.userOrganizeID IN(0,1,5) or u.clubStatus != 92) and u.userOrganizeID != 4 AND u.userIdentity != 8
             <if test="clubID != null and clubID != ''">
                 AND a.clubID = #{clubID}
             </if>

+ 3 - 2
src/main/webapp/WEB-INF/views/modules/userNew/cmAgencyList.jsp

@@ -413,8 +413,8 @@
         <th>状态</th>
         <th>审核人</th>
         <th>机构级别</th>
-        <th>活跃状态<span class="acticer_span" onclick="activeStageMessage(1)">?</span></th>
-        <th>客户价值<span class="acticer_span" onclick="activeStageMessage(2)">?</span></th>
+<%--        <th>活跃状态<span class="acticer_span" onclick="activeStageMessage(1)">?</span></th>--%>
+<%--        <th>客户价值<span class="acticer_span" onclick="activeStageMessage(2)">?</span></th>--%>
         <th>注册IP</th>
         <th>注册时间</th>
         <th>审核时间</th>
@@ -431,6 +431,7 @@
             <td>
                     <%--                <c:if test="${newCmClubList.userIdentity eq 2}">--%>
                 <a href="${ctx}/new/user/agency/clubPortrait?clubID=${newCmClubList.clubID}&clubName=${newCmClubList.name}&dateType=0&type=4">${newCmClubList.name}</a>
+                        <c:if test="${newCmClubList.userOrganizeID eq 5}"><p style="color:red">(美易转)</p></c:if>
                     <%--                </c:if>--%>
                     <%--                <c:if test="${newCmClubList.userIdentity eq 4}">--%>
                     <%--                    <c:if test="${newCmClubList.name ne newCmClubList.userName}">--%>