Просмотр исходного кода

1、添加、修改用户时新增判断用户角色类型
2、客户信息表新增联系人部门和职位
3、修改新增修改接口,如果是主要联系人,同步到客户信息表
4、客户联系人列表修改

anderx лет назад: 4
Родитель
Сommit
d2b2ad208d

+ 5 - 5
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -728,11 +728,11 @@
 	</select>
 
 	<select id="findCustomerContacts" parameterType="java.lang.String" resultType="com.goafanti.common.model.OrganizationContactBook">
-	select a.id,a.name,a.mobile,a.email,a.qq,a.wechat,a.department,a.position,a.major,a.fixed_tel fixedTel,a.aname,b.location_province,
-	d1.name provinceName,d2.name cityName,d3.name areaName,date_format(a.create_time,'%Y-%m-%d')createTimes,a.aid
-	from organization_contact_book a
-	left join organization_identity b on a.uid=b.uid left join district_glossory d1 on b.location_province=d1.id
-	left join district_glossory d2 on b.location_city=d2.id left join district_glossory d3 on b.location_area=d3.id
+		select a.id,a.name,a.mobile,a.email,a.qq,a.wechat,a.department,a.position,a.major,a.fixed_tel fixedTel,ad.name aname,b.location_province,
+			   d1.name provinceName,d2.name cityName,d3.name areaName,date_format(a.create_time,'%Y-%m-%d')createTimes,a.aid
+		from organization_contact_book a left join admin ad on a.aid=ad.id
+		 left join organization_identity b on a.uid=b.uid left join district_glossory d1 on b.location_province=d1.id
+		 left join district_glossory d2 on b.location_city=d2.id left join district_glossory d3 on b.location_area=d3.id
 		where a.uid = #{uid,jdbcType=VARCHAR} and a.aid= #{aid,jdbcType=VARCHAR} order by a.create_time desc
 	</select>
 

+ 3 - 0
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -1156,6 +1156,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			if (flag <= 0)
 				throw new BusinessException(new Error(ErrorConstants.CUSTOMER_ALREADY_RECEIVE, ""));
 			updateUserMid(aid,uid,0,null);
+			organizationContactBookMapper.updateAdmin(uid,aid);
 			//转交
 		} else if (AFTConstants.USER_TRANSFER_TO_OTHER.equals(operatorType)
 				|| AFTConstants.SIGN_USER_TRANSFER_TO_OTHER == operatorType) {
@@ -1212,6 +1213,8 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		return 1;
 	}
 
+
+
 	/**
 	 * 处理中间表
 	 * @param aid