外部协销

src/main/resources/mappings/modules/serviceteam/CmServiceteamRoleMapper.xml

@@ -102,7 +102,7 @@
 			0
 		)
 	</insert>
-	<insert id="save" parameterType="CmServiceteamRole" keyProperty="id" useGeneratedKeys="true">
+	<insert id="save" parameterType="CmServiceteamRole" keyProperty="teamId" useGeneratedKeys="true">
 		INSERT INTO cm_serviceteam_role(
 			leaderId,
 			createdTime,

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

@@ -38,6 +38,9 @@
 		LEFT JOIN c_serviceproviderstatus cs ON a.`status` = cs.c_serviceProviderStatusID
 		<where>
 			organizeID = 0
+		    <if test="insiderFlag != null">
+				AND insiderFlag = #{insiderFlag}
+			</if>
 			<if test="serviceProviderID != null and serviceProviderID != ''">
 				AND a.serviceProviderID = #{serviceProviderID}
 			</if>

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

@@ -52,6 +52,12 @@
 		</form:select>
 		<label>手机号：</label>
 			<form:input path="contractMobile" htmlEscape="false" maxlength="20" class="input-medium"/>
+		<label>类型：</label>
+		<form:select path="insiderFlag" class="input-medium">
+			<form:option value="" label="请选择"/>
+			<form:option value="0" label="内部协销"/>
+			<form:option value="1" label="外部协销"/>
+		</form:select>
 		&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
 		<div class="clearfix"></div>
 	</div>
@@ -65,6 +71,7 @@
 				<%--<th>联系人</th>--%>
 				<th>手机号</th>
 				<th>状态</th>
+				<th>类型</th>
 				<%--<th>身份</th>--%>
 				<th>创建时间</th>
 				<shiro:hasPermission name="user:newCmClub:edit"><th>操作</th></shiro:hasPermission>
@@ -85,6 +92,14 @@
 						已下线
 					</c:if>
 				</td>
+				<td>
+					<c:if test="${newCmSp.insiderFlag eq 0}">
+						内部协销
+					</c:if>
+					<c:if test="${newCmSp.insiderFlag eq 1}">
+						外部协销
+					</c:if>
+				</td>
 				<%--<td>${newCmSp.spIdentity}</td>--%>
 				<td>${newCmSp.addTime}</td>
 				<shiro:hasPermission name="user:newCmClub:edit">