Merge remote-tracking branch 'remotes/origin/developer' into developerA

src/main/java/com/caimei/modules/cmpage/web/CmPageController.java

@@ -162,7 +162,7 @@ public class CmPageController extends BaseController {
         if ("2".equals(cmPage.getType())) {
             // 更新索引
             coreServiceUitls.updateEquipmentIndex(Integer.parseInt(cmPage.getId()));
-        } else if ("6".equals(cmPage.getType()) || "7".equals(cmPage.getType())) {
+        } else {
             //清除活动专题缓存
             redisService.removePattern("getPageFloorData*");
         }

src/main/java/com/caimei/modules/newhome/web/NewPageFloorController.java

@@ -308,10 +308,8 @@ public class NewPageFloorController extends BaseController {
         if (floorContent.getFloorId() != null) {
             return "redirect:" + Global.getAdminPath() + "/newhome/newPageFloor/?repage";
         } else if (StringUtils.isNotBlank(floorContent.getFormType())) {
-            if ("6".equals(floorContent.getFormType()) || "7".equals(floorContent.getFormType())) {
-                //清除活动专题缓存
-                redisService.removePattern("getPageFloorData*");
-            }
+            //清除活动专题缓存
+            redisService.removePattern("getPageFloorData*");
             if (floorContent.getRedirectFlag() == 1) {
                 return "redirect:" + Global.getAdminPath() + "/cmpage/cmPageCentre/?pageId=" + floorContent.getPageId() + "&type=" + floorContent.getFormType();
             } else {

src/main/resources/mappings/modules/miniprogram/CmMiniProgramUserMapper.xml

@@ -12,23 +12,12 @@
 		a.bindMobile AS "bindMobile",
 		a.image AS "image",
 		a.password AS "password",
-		a.userLevelID AS "userLevelID",
 		a.name AS "name",
 		a.realName AS "realName",
-		a.nick AS "nick",
-		a.sex AS "sex",
 		a.userIdentity AS "userIdentity",
 		a.registerUserTypeID AS "registerUserTypeID",
-		a.companyUserID AS "companyUserID",
-		a.openID AS "openID",
-		a.manufacturerFlag AS "manufacturerFlag",
 		a.manufacturerStatus AS "manufacturerStatus",
-		a.upgradeBy AS "upgradeBy",
 		a.shopID AS "shopID",
-		a.serviceProviderFlag AS "serviceProviderFlag",
-		a.clubFlag AS "clubFlag",
-		a.masterFlag AS "masterFlag",
-		a.normalFlag AS "normalFlag",
 		a.auditStatus AS "auditStatus",
 		a.auditTime AS "auditTime",
 		a.auditNote AS "auditNote",
@@ -37,47 +26,20 @@
 		a.loginTime AS "loginTime",
 		a.loginIP AS "loginIP",
 		a.validFlag AS "validFlag",
-		a.emailCheckFlag AS "emailCheckFlag",
-		a.mobileCheckFlag AS "mobileCheckFlag",
 		a.clubStatus AS "clubStatus",
 		a.clubID AS "clubID",
 		a.agreeFlag AS "agreeFlag",
-		a.activationCode AS "activationCode",
-		a.activationDate AS "activationDate",
 		a.serviceProviderStatus AS "serviceProviderStatus",
 		a.serviceProviderID AS "serviceProviderID",
-		a.masterStatus AS "masterStatus",
-		a.masterID AS "masterID",
 		a.userMoney AS "userMoney",
-		a.point AS "point",
-		a.shopERPFlag AS "shopERPFlag",
-		a.fromUserID AS "fromUserID",
-		a.fromUserName AS "fromUserName",
 		a.logoffTime AS "logoffTime",
 		a.appKey AS "appKey",
 		a.appSecret AS "appSecret",
-		a.sampleFlag AS "sampleFlag",
 		a.scanFlag AS "scanFlag",
-		a.sysroleid AS "sysroleid",
-		a.gender AS "gender",
-		a.age AS "age",
-		a.salerbuyer AS "salerbuyer",
-		a.position AS "position",
-		a.skill AS "skill",
-		a.workage AS "workage",
-		a.wechat AS "wechat",
-		a.qq AS "qq",
-		a.smsFlag AS "smsFlag",
 		a.userBeans AS "userBeans",
-		a.privateShopFlag AS "privateShopFlag",
-		a.privateClubFlag AS "privateClubFlag",
-		a.isMeiDaoAuthorized AS "isMeiDaoAuthorized",
 		a.guideFlag AS "guideFlag",
 		a.loginFailTime AS "loginFailTime",
-		a.tipStatus AS "tipStatus",
-		a.applyTime AS "applyTime",
-		a.miniProgramOpenId AS "miniProgramOpenId",
-		a.miniProgramId AS "miniProgramId"
+		a.tipStatus AS "tipStatus"
 	</sql>
 
 	<sql id="cmMiniProgramUserJoins">
@@ -140,23 +102,12 @@
 			bindMobile,
 			image,
 			password,
-			userLevelID,
 			name,
 			realName,
-			nick,
-			sex,
 			userIdentity,
 			registerUserTypeID,
-			companyUserID,
-			openID,
-			manufacturerFlag,
 			manufacturerStatus,
-			upgradeBy,
 			shopID,
-			serviceProviderFlag,
-			clubFlag,
-			masterFlag,
-			normalFlag,
 			auditStatus,
 			auditTime,
 			auditNote,
@@ -165,46 +116,19 @@
 			loginTime,
 			loginIP,
 			validFlag,
-			emailCheckFlag,
-			mobileCheckFlag,
 			clubStatus,
 			clubID,
 			agreeFlag,
-			activationCode,
-			activationDate,
 			serviceProviderStatus,
 			serviceProviderID,
-			masterStatus,
-			masterID,
 			userMoney,
-			point,
-			shopERPFlag,
-			fromUserID,
-			fromUserName,
 			logoffTime,
 			appKey,
 			appSecret,
-			sampleFlag,
 			scanFlag,
-			sysroleid,
-			gender,
-			age,
-			salerbuyer,
-			position,
-			skill,
-			workage,
-			wechat,
-			qq,
-			smsFlag,
 			userBeans,
-			privateShopFlag,
-			privateClubFlag,
-			isMeiDaoAuthorized,
 			loginFailTime,
-			tipStatus,
-			applyTime,
-			miniProgramOpenId,
-			miniProgramId
+			tipStatus
 		) VALUES (
 			#{account},
 			#{mobile},
@@ -214,23 +138,12 @@
 			#{bindMobile},
 			#{image},
 			#{password},
-			#{userLevelID},
 			#{name},
 			#{realName},
-			#{nick},
-			#{sex},
 			#{userIdentity},
 			#{registerUserTypeID},
-			#{companyUserID},
-			#{openID},
-			#{manufacturerFlag},
 			#{manufacturerStatus},
-			#{upgradeBy},
 			#{shopID},
-			#{serviceProviderFlag},
-			#{clubFlag},
-			#{masterFlag},
-			#{normalFlag},
 			#{auditStatus},
 			#{auditTime},
 			#{auditNote},
@@ -239,46 +152,18 @@
 			#{loginTime},
 			#{loginIP},
 			#{validFlag},
-			#{emailCheckFlag},
-			#{mobileCheckFlag},
 			#{clubStatus},
 			#{clubID},
 			#{agreeFlag},
-			#{activationCode},
-			#{activationDate},
 			#{serviceProviderStatus},
 			#{serviceProviderID},
-			#{masterStatus},
-			#{masterID},
 			#{userMoney},
-			#{point},
-			#{shopERPFlag},
-			#{fromUserID},
-			#{fromUserName},
-			#{logoffTime},
 			#{appKey},
 			#{appSecret},
-			#{sampleFlag},
 			#{scanFlag},
-			#{sysroleid},
-			#{gender},
-			#{age},
-			#{salerbuyer},
-			#{position},
-			#{skill},
-			#{workage},
-			#{wechat},
-			#{qq},
-			#{smsFlag},
 			#{userBeans},
-			#{privateShopFlag},
-			#{privateClubFlag},
-			#{isMeiDaoAuthorized},
 			#{loginFailTime},
-			#{tipStatus},
-			#{applyTime},
-			#{miniProgramOpenId},
-			#{miniProgramId}
+			#{tipStatus}
 		)
 	</insert>
 
@@ -292,23 +177,12 @@
 			bindMobile = #{bindMobile},
 			image = #{image},
 			password = #{password},
-			userLevelID = #{userLevelID},
 			name = #{name},
 			realName = #{realName},
-			nick = #{nick},
-			sex = #{sex},
 			userIdentity = #{userIdentity},
 			registerUserTypeID = #{registerUserTypeID},
-			companyUserID = #{companyUserID},
-			openID = #{openID},
-			manufacturerFlag = #{manufacturerFlag},
 			manufacturerStatus = #{manufacturerStatus},
-			upgradeBy = #{upgradeBy},
 			shopID = #{shopID},
-			serviceProviderFlag = #{serviceProviderFlag},
-			clubFlag = #{clubFlag},
-			masterFlag = #{masterFlag},
-			normalFlag = #{normalFlag},
 			auditStatus = #{auditStatus},
 			auditTime = #{auditTime},
 			auditNote = #{auditNote},
@@ -317,47 +191,20 @@
 			loginTime = #{loginTime},
 			loginIP = #{loginIP},
 			validFlag = #{validFlag},
-			emailCheckFlag = #{emailCheckFlag},
-			mobileCheckFlag = #{mobileCheckFlag},
 			clubStatus = #{clubStatus},
 			clubID = #{clubID},
 			agreeFlag = #{agreeFlag},
-			activationCode = #{activationCode},
-			activationDate = #{activationDate},
 			serviceProviderStatus = #{serviceProviderStatus},
 			serviceProviderID = #{serviceProviderID},
-			masterStatus = #{masterStatus},
-			masterID = #{masterID},
 			userMoney = #{userMoney},
-			point = #{point},
-			shopERPFlag = #{shopERPFlag},
-			fromUserID = #{fromUserID},
-			fromUserName = #{fromUserName},
 			logoffTime = #{logoffTime},
 			appKey = #{appKey},
 			appSecret = #{appSecret},
-			sampleFlag = #{sampleFlag},
 			scanFlag = #{scanFlag},
-			sysroleid = #{sysroleid},
-			gender = #{gender},
-			age = #{age},
-			salerbuyer = #{salerbuyer},
-			position = #{position},
-			skill = #{skill},
-			workage = #{workage},
-			wechat = #{wechat},
-			qq = #{qq},
-			smsFlag = #{smsFlag},
 			userBeans = #{userBeans},
-			privateShopFlag = #{privateShopFlag},
-			privateClubFlag = #{privateClubFlag},
-			isMeiDaoAuthorized = #{isMeiDaoAuthorized},
 			guideFlag = #{guideFlag},
 			loginFailTime = #{loginFailTime},
-			tipStatus = #{tipStatus},
-			applyTime = #{applyTime},
-			miniProgramOpenId = #{miniProgramOpenId},
-			miniProgramId = #{miniProgramId}
+			tipStatus = #{tipStatus}
 		WHERE userID = #{userID}
 	</update>
 

src/main/resources/mappings/modules/user/CmNormalUserMapper.xml

@@ -8,25 +8,15 @@
 		a.bindMobile AS "bindMobile",
 		a.realName AS "realName",
 		a.userIdentity AS "userIdentity",
-		a.companyUserID AS "companyUserID",
-		a.openID AS "openID",
 		a.mobile AS "mobile",
 		a.email AS "email",
 		a.userName AS "userName",
 		a.image AS "image",
 		a.password AS "password",
-		a.userLevelID AS "userLevelID",
 		a.name AS "name",
-		a.nick AS "nick",
-		a.sex AS "sex",
 		a.registerUserTypeID AS "registerUserTypeID",
-		a.manufacturerFlag AS "manufacturerFlag",
 		a.manufacturerStatus AS "manufacturerStatus",
 		a.shopID AS "shopID",
-		a.serviceProviderFlag AS "serviceProviderFlag",
-		a.clubFlag AS "clubFlag",
-		a.masterFlag AS "masterFlag",
-		a.normalFlag AS "normalFlag",
 		a.auditStatus AS "auditStatus",
 		a.auditTime AS "auditTime",
 		a.auditNote AS "auditNote",
@@ -36,42 +26,18 @@
 		a.loginFailTime AS "loginFailTime",
 		a.loginIP AS "loginIP",
 		a.validFlag AS "validFlag",
-		a.emailCheckFlag AS "emailCheckFlag",
-		a.mobileCheckFlag AS "mobileCheckFlag",
 		a.clubStatus AS "clubStatus",
 		a.clubID AS "clubID",
 		a.agreeFlag AS "agreeFlag",
-		a.activationCode AS "activationCode",
-		a.activationDate AS "activationDate",
 		a.serviceProviderStatus AS "serviceProviderStatus",
 		a.serviceProviderID AS "serviceProviderID",
-		a.masterStatus AS "masterStatus",
-		a.masterID AS "masterID",
 		a.userMoney AS "userMoney",
 		a.ableUserMoney AS "ableUserMoney",
-		a.point AS "point",
-		a.shopERPFlag AS "shopERPFlag",
-		a.fromUserID AS "fromUserID",
-		a.fromUserName AS "fromUserName",
 		a.logoffTime AS "logoffTime",
 		a.appKey AS "appKey",
 		a.appSecret AS "appSecret",
-		a.sampleFlag AS "sampleFlag",
 		a.scanFlag AS "scanFlag",
-		a.sysroleid AS "sysroleid",
-		a.gender AS "gender",
-		a.age AS "age",
-		a.salerbuyer AS "salerbuyer",
-		a.position AS "position",
-		a.skill AS "skill",
-		a.workage AS "workage",
-		a.wechat AS "wechat",
-		a.qq AS "qq",
-		a.smsFlag AS "smsFlag",
 		a.userBeans AS "userBeans",
-		a.privateShopFlag AS "privateShopFlag",
-		a.privateClubFlag AS "privateClubFlag",
-		a.isMeiDaoAuthorized AS "isMeiDaoAuthorized",
 		a.guideFlag AS "guideFlag",
 		b.nickName AS "nickName"
 	</sql>

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

@@ -5,248 +5,46 @@
     <title>机构列表</title>
     <meta name="decorator" content="default"/>
     <style type="text/css">
-        .reg-row .new-tag.active {
-            border: 1px solid #de5801
-        }
-
-        .reg-row {
-            margin-bottom: 20px
-        }
-
-        .reg-row .reg-label {
-            display: inline-block;
-            width: 120px;
-            text-align: right;
-            font-size: 13px
-        }
-
-        .the-oradio {
-            display: inline-block;
-            vertical-align: top
-        }
-
-        .the-oradio div {
-            width: 85px;
-            display: inline-block;
-            font-size: 12px;
-            color: #666
-        }
-
-        .the-oradio div input[type="radio"] {
-            width: 17px;
-            height: 17px;
-            margin-right: 5px;
-            vertical-align: text-top
-        }
-
-        .med-option {
-            display: block;
-            margin: 10px 0 0 125px
-        }
-
-        .reg-row .business-license {
-            position: relative;
-            display: inline-block;
-            width: 166px;
-            height: 123px;
-            border-radius: 6px;
-            margin: 18px 0 0 125px
-        }
-
-        #medicalPracticeLicenseImgPreview {
-            display: inline-block
-        }
-
-        .qualification {
-            margin-top: 20px
-        }
-
-        .reg-row .tags-area {
-            display: inline-block;
-            width: 420px
-        }
-
-        .reg-row .new-tag {
-            display: inline-block;
-            width: 70px;
-            border: 1px solid #e5e5e5;
-            border-radius: 6px;
-            padding: 5px;
-            margin-right: 14px;
-            margin-bottom: 14px;
-            text-align: center;
-            font-size: 10px;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            cursor: pointer
-        }
-
-        .reg-row .tags-operate {
-            margin-left: 125px
-        }
-
-        .reg-row .reg-input {
-            width: 336px;
-            height: 32px;
-            padding: 0 8px;
-            margin-right: 20px;
-            border: 1px solid #dcdcdc;
-            border-radius: 6px
-        }
-
-        .reg-row .tags-operate .tag-input {
-            width: 159px;
-            margin-right: 13px;
-            display: none;
-            vertical-align: top
-        }
-
-        .reg-row .tags-operate .tag-add {
-            line-height: 20px;
-            vertical-align: middle;
-            margin-bottom: 0;
-            vertical-align: top
-        }
-
-        .reg-row .tags-area {
-            vertical-align: top
-        }
-
-        .tag-add {
-            display: none
-        }
-
-        .table th {
-            text-align: center
-        }
-
-        .table td {
-            text-align: center
-        }
-
-        .modal {
-            width: 700px;
-            margin-left: -350px
-        }
-
-        #myModal {
-            display: none
-        }
-
-        .modal-body {
-            max-height: 300px !important
-        }
-
-        .modal.fade.in {
-            top: 0 !important
-        }
-
-        #btnSubmit {
-            margin-left: 20px
-        }
-
-        /*.flex-wrap{max-width:1280px}*/
-        .flex-wrap .item {
-            margin-right: 20px;
-        }
-
-        #auditBox {
-            padding: 20px;
-            line-height: 30px
-        }
-
-        #auditBox .bd-row {
-            display: flex;
-            margin-bottom: 15px
-        }
-
-        #auditBox .bd-row > span {
-            display: inline-block;
-            width: 60px
-        }
-
-        #auditBox .auditCheckBox {
-            width: 250px
-        }
-
-        #auditBox .auditCheckBox label {
-            margin: 0 5px 5px 0
-        }
-
-        #auditBox .auditCheckBox input {
-            display: none
-        }
-
-        #auditBox .auditCheckBox input + span {
-            display: inline-block;
-            line-height: 24px;
-            padding: 0 12px;
-            border: 1px solid #666;
-            border-radius: 5px
-        }
-
-        #auditBox .auditCheckBox input:checked + span {
-            background-color: #E6633A
-        }
-
-        #alertModal {
-            width: 300px;
-            height: 200px;
-            border: 1px solid #ebebeb;
-            border-radius: 10px;
-            position: fixed;
-            top: 0;
-            bottom: 0;
-            left: 0;
-            right: 0;
-            margin: auto;
-            background: #FFFFFF;
-            display: none;
-        }
-
-        #alertModal .title {
-            height: 50px;
-            line-height: 50px;
-            font-size: 14px;
-            font-weight: bold;
-            text-align: center;
-            position: relative;
-            border-bottom: 1px solid #EBEBEB;
-        }
-
-        #alertModal .close {
-            width: 50px;
-            height: 50px;
-            display: block;
-            position: absolute;
-            right: 0;
-            top: 0;
-            line-height: 50px;
-            color: #000;
-            font-weight: bold;
-            text-align: center;
-            font-style: normal;
-            font-size: 18px;
-        }
-
-        #alertModal .alert-content {
-            width: 260px;
-            height: 60px;
-            padding: 20px;
-        }
-
-        #alertModal .alertModal-btn {
-            width: 260px;
-            height: 49px;
-            padding: 0 20px;
-            border-top: 1px solid #EBEBEB;
-        }
-
-        #alertModal .alertModal-btn button {
-            float: right;
-            margin: 5px;
-        }
+        .reg-row .new-tag.active{border:1px solid #de5801}
+        .reg-row{margin-bottom:20px}
+        .reg-row .reg-label{display:inline-block;width:120px;text-align:right;font-size:13px}
+        .the-oradio{display:inline-block;vertical-align:top}
+        .the-oradio div{width:85px;display:inline-block;font-size:12px;color:#666}
+        .the-oradio div input[type="radio"]{width:17px;height:17px;margin-right:5px;vertical-align:text-top}
+        .med-option{display:block;margin:10px 0 0 125px}
+        .reg-row .business-license{position:relative;display:inline-block;width:166px;height:123px;border-radius:6px;margin:18px 0 0 125px}
+        #medicalPracticeLicenseImgPreview{display:inline-block}
+        .qualification{margin-top:20px}
+        .reg-row .tags-area{display:inline-block;width:420px}
+        .reg-row .new-tag{display:inline-block;width:70px;border:1px solid #e5e5e5;border-radius:6px;padding:5px;margin-right:14px;margin-bottom:14px;text-align:center;font-size:10px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;cursor:pointer}
+        .reg-row .tags-operate{margin-left:125px}
+        .reg-row .reg-input{width:336px;height:32px;padding:0 8px;margin-right:20px;border:1px solid #dcdcdc;border-radius:6px}
+        .reg-row .tags-operate .tag-input{width:159px;margin-right:13px;display:none;vertical-align:top}
+        .reg-row .tags-operate .tag-add{line-height:20px;vertical-align:middle;margin-bottom:0;vertical-align:top}
+        .reg-row .tags-area{vertical-align:top}
+        .tag-add{display:none}
+        .table th{text-align:center}
+        .table td{text-align:center}
+        .modal{width:700px;margin-left:-350px}
+        #myModal{display:none}
+        .modal-body{max-height:300px !important}
+        .modal.fade.in{top:0 !important}
+        #btnSubmit{margin-left:20px}
+        .flex-wrap .item{margin-right:20px}
+        #auditBox{padding:20px;line-height:30px}
+        #auditBox .bd-row{display:flex;margin-bottom:15px}
+        #auditBox .bd-row > span{display:inline-block;width:60px}
+        #auditBox .auditCheckBox{width:250px}
+        #auditBox .auditCheckBox label{margin:0 5px 5px 0}
+        #auditBox .auditCheckBox input{display:none}
+        #auditBox .auditCheckBox input + span{display:inline-block;line-height:24px;padding:0 12px;border:1px solid #666;border-radius:5px}
+        #auditBox .auditCheckBox input:checked + span{background-color:#E6633A}
+        #alertModal{width:300px;height:200px;border:1px solid #ebebeb;border-radius:10px;position:fixed;top:0;bottom:0;left:0;right:0;margin:auto;background:#FFFFFF;display:none}
+        #alertModal .title{height:50px;line-height:50px;font-size:14px;font-weight:bold;text-align:center;position:relative;border-bottom:1px solid #EBEBEB}
+        #alertModal .close{width:50px;height:50px;display:block;position:absolute;right:0;top:0;line-height:50px;color:#000;font-weight:bold;text-align:center;font-style:normal;font-size:18px}
+        #alertModal .alert-content{width:260px;height:60px;padding:20px}
+        #alertModal .alertModal-btn{width:260px;height:49px;padding:0 20px;border-top:1px solid #EBEBEB}
+        #alertModal .alertModal-btn button{float:right;margin:5px}
     </style>
 </head>
 <body>
@@ -429,30 +227,40 @@
             <td>
                     ${newCmClubList.auditTime}
             </td>
-            <shiro:hasPermission name="user:newCmClub:edit">
-                <td>
+            <td>
+                <shiro:hasPermission name="club:cmAgency:edit">
                     <a href="${ctx}/new/user/agency/form?id=${newCmClubList.clubID}&source=1&searchName=${newCmClub.searchName}&searchUserName=${newCmClub.searchUserName}&searchBindMobile=${newCmClub.searchBindMobile}&searchEmail=${newCmClub.searchEmail}&searchUserOrganizeID=${newCmClub.searchUserOrganizeID}&searchStatus=${newCmClub.searchStatus}&searchUserIdentity=${newCmClub.searchUserIdentity}&searchStartTime=${newCmClub.searchStartTime}&searchEndTime=${newCmClub.searchEndTime}">编辑</a>
-                    <c:if test="${newCmClubList.status eq 90 || newCmClubList.status eq 91 || newCmClubList.status eq 40}">
-                        <%--<a hidden href="${ctx}/new/user/agency/form?id=${newCmClubList.id}">设为集团会所</a>--%>
+                </shiro:hasPermission>
+                <c:if test="${newCmClubList.status eq 90 || newCmClubList.status eq 91 || newCmClubList.status eq 40}">
+                    <shiro:hasPermission name="club:cmAgency:password">
                         <a href="javascript:void(0);" onclick="updatePwd(${newCmClubList.userID})">重置密码</a>
-                    </c:if>
-                    <c:if test="${newCmClubList.status eq 90 || newCmClubList.status eq 40 || newCmClubList.status eq 1 || newCmClubList.status eq 92}">
-                        <%--不存在组织的用户为采美用户，只有采美用户才以下功能--%>
-<%--                        <c:if test="${newCmClubList.userOrganizeID eq null or newCmClubList.userOrganizeID eq 0 or newCmClubList.userOrganizeID eq 2}">--%>
-                            <a href="javascript:void(0);" onclick="showSPSelect(${newCmClubList.clubID})">更换协销</a>
-<%--                        </c:if>--%>
+                    </shiro:hasPermission>
+                </c:if>
+                <c:if test="${newCmClubList.status eq 90 || newCmClubList.status eq 40 || newCmClubList.status eq 1 || newCmClubList.status eq 92}">
+                    <shiro:hasPermission name="club:cmAgency:changSp">
+                        <a href="javascript:void(0);" onclick="showSPSelect(${newCmClubList.clubID})">更换协销</a>
+                    </shiro:hasPermission>
+                    <shiro:hasPermission name="club:cmAgency:showOp">
                         <a href="${ctx}/new/user/agency/operation?userOrganizeID=${newCmClubList.userOrganizeID}&clubID=${newCmClubList.clubID}&userID=${newCmClubList.userID}&name=${newCmClubList.name}">查看运营人员</a>
-                    </c:if>
-                    <c:if test="${newCmClubList.status eq 1 || newCmClubList.status eq 92}">
+                    </shiro:hasPermission>
+                </c:if>
+                <c:if test="${newCmClubList.status eq 1 || newCmClubList.status eq 92}">
+                    <shiro:hasPermission name="club:cmAgency:audit">
                         <a href="javascript:void(0);" onclick="toAudit(${newCmClubList.clubID},'${newCmClubList.userName}','${newCmClubList.bindMobile}')">审核</a>
-                    </c:if>
+                    </shiro:hasPermission>
+                </c:if>
+                <shiro:hasPermission name="club:cmAgency:category">
                     <a href="javascript:void(0);" onclick="showClubAlert(${newCmClubList.clubID},${newCmClubList.userIdentity})">设置机构类别</a>
-                    <c:if test="${newCmClubList.status eq 92 || newCmClubList.status eq 93}">
+                </shiro:hasPermission>
+                <c:if test="${newCmClubList.status eq 92 || newCmClubList.status eq 93}">
+                    <shiro:hasPermission name="club:cmAgency:conform">
                         <a href="${ctx}/user/clubTemporary/confirmRecord?confirmUserId=${newCmClubList.userID}">确认记录</a>
-                    </c:if>
-                    <a href="${ctx}/new/user/agency/remarks?clubId=${newCmClubList.clubID}" >资料备注</a>
-                </td>
-            </shiro:hasPermission>
+                    </shiro:hasPermission>
+                </c:if>
+                <shiro:hasPermission name="club:cmAgency:remarks">
+                    <a href="${ctx}/new/user/agency/remarks?clubId=${newCmClubList.clubID}">资料备注</a>
+                </shiro:hasPermission>
+            </td>
         </tr>
     </c:forEach>
     </tbody>