bugfix

src/main/java/com/caimei/modules/user/dao/CmSpDao.java

@@ -30,4 +30,6 @@ public interface CmSpDao extends CrudDao<NewCmSp> {
     void updateManager();
 
     void choseManager(Integer serviceProviderID);
+
+    void deleteManager();
 }

src/main/java/com/caimei/modules/user/service/CmSpService.java

@@ -65,7 +65,7 @@ public class CmSpService extends CrudService<CmSpDao, NewCmSp> {
 	}
 	@Transactional(readOnly = false)
 	public void saveLeader(Integer serviceProviderID) {
-		cmSpDao.updateManager();
+		cmSpDao.deleteManager();
 		cmSpDao.choseManager(serviceProviderID);
 	}
 }

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

@@ -56,9 +56,10 @@
 	</select>
     <select id="findTeams" resultType="com.caimei.modules.serviceteam.entity.CmServiceteamRole">
 		SELECT DISTINCT
-		csr.leaderId,csr.manager,csr.createdTime,s.name as leaderName,csr.id as teamId
+		csr.leaderId,IF(csm.serviceproviderId IS NULL,2,1) as manager,csr.createdTime,s.name as leaderName,csr.id as teamId
 		FROM cm_serviceteam_role csr
-		LEFT JOIN serviceprovider s ON csr.leaderId=s.serviceProviderID
+		LEFT JOIN serviceprovider s ON csr.leaderId = s.serviceProviderID
+		LEFT JOIN cm_serviceteam_manager csm ON csr.leaderId = csm.serviceproviderId
 		<if test="leaderName != null and leaderName != ''">
 		LEFT JOIN cm_serviceteam_group csg ON csg.teamId = csr.id
 		WHERE csg.serviceId IN

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

@@ -151,8 +151,11 @@
 		DELETE FROM serviceprovider
 		WHERE serviceProviderID = #{serviceProviderID}
 	</delete>
+    <delete id="deleteManager">
+		DELETE FROM cm_serviceteam_manager
+	</delete>
 
-	<select id="findSpManager" resultType="NewCmSp">
+    <select id="findSpManager" resultType="NewCmSp">
 		select
 		<include refid="newCmSpColumns"/>
 		FROM serviceprovider a
@@ -197,11 +200,10 @@
 		update cm_serviceteam_role set
 		manager = 2
 	</update>
-	<update id="choseManager">
-		update cm_serviceteam_role set
-		manager = 1
-		where leaderId = #{serviceProviderID}
-	</update>
+	<insert id="choseManager">
+		insert into cm_serviceteam_manager (serviceProviderId,delflag)
+		values (#{serviceProviderID},0)
+	</insert>
 	<select id="findByUserId" resultType="com.caimei.modules.user.entity.NewCmSp">
 		SELECT
 		<include refid="newCmSpColumns"/>

src/main/webapp/WEB-INF/views/modules/serviceteam/cmServiceteamRoleForm.jsp

@@ -73,6 +73,7 @@
 <form:form id="inputForm" modelAttribute="cmServiceteamRole" action="${ctx}/serviceteam/cmServiceteamRole/save"
            method="post" class="form-horizontal">
     <form:hidden path="id"/>
+    <form:hidden path="teamId"/>
     <sys:message content="${message}"/>
     <div class="control-group">
         <div class="controls">