Browse Source

公出撤销BUG修复

anderx 3 years ago
parent
commit
d6e868c777

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

@@ -391,7 +391,7 @@
 		where department_id=#{departmentId,jdbcType=VARCHAR}) d on a.aid = d.id
 		</if>
 		where a.type = 1 and a.status =0
-		<if test="role == 0">
+		<if test="role == 0 and name !=null">
 		and un.name = #{name}
 	</if>
 	<if test="role == 1 and name != null">

+ 13 - 10
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -212,6 +212,9 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			params.put("role", 1);
 		} else {
 			params.put("role", 0);
+			//处理为空报错
+			if (StringUtils.isBlank(cli.getName())) params.put("name", "");
+
 		}
 
 		Pagination<CustomerListOut> p = (Pagination<CustomerListOut>) findPage("selectOrganizationCustomerList",
@@ -605,7 +608,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 
 	/**
 	 * 推动指导已读
-	 * 
+	 *
 	 * @param uid
 	 */
 	@Override
@@ -714,7 +717,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 //						if (StringUtils.isNotBlank(fbb.getUid())) ub.setUid(fbb.getUid());
 //						lockProject(ub);//锁定客户业务
 //						x=1;
-//					}		
+//					}
 					userBusiness.setBusinessProjectId(ub.getBusinessProjectId());
 					userBusiness.setCustomerStatus(ub.getCustomerStatus());
 					userBusiness.setFollowSituation(ub.getFollowSituation());
@@ -799,7 +802,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 
 	/**
 	 * 跟进更新用户中间表
-	 * 
+	 *
 	 */
 	private void followProject(String uid) {
 		Date date = new Date();
@@ -1243,7 +1246,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	}
 
 	/**
-	 * 
+	 *
 	 * @param uid      客户id
 	 * @param aid      接受者id
 	 * @param lockTime 时间
@@ -1278,7 +1281,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	}
 
 	/**
-	 * 
+	 *
 	 * @param type 0录入 1 领取 2 转交私有客户 3转交业务 4 未跟进丢失(30) 5未签单丢失(270天)6释放 7转交签单客户
 	 */
 	private void addUserTransferLog(String uid, String aid,String oldAid, Integer type, String pid,
@@ -1796,7 +1799,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 
 	/**
 	 * 查询需要释放的业务
-	 * 
+	 *
 	 * @param uid
 	 * @return
 	 */
@@ -1807,7 +1810,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 
 	/**
 	 * 处理需要释放
-	 * 
+	 *
 	 */
 	@Override
 	public void updateReleaseLock(Date releaseTime) {
@@ -2258,7 +2261,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		return findPage("selectChannelCountsList", "selectChannelCountsCount", params, in.getPageNo(),
 				in.getPageSize());
 	}
-	
+
 	@Override
 	public Object getUserByName(String name) {
 		return userMapper.getUserByName(name);
@@ -2283,7 +2286,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		userNamesMapper.insertSelective(un);
 		return 1;
 	}
-	
+
 	@Override
 	public boolean checkUserName(String userName) {
 		int i=userNamesMapper.checkUserName(userName);
@@ -2364,4 +2367,4 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		oi.setIntendedProject(intendedProject);
 		return organizationIdentityMapper.updateServiceByUid(oi);
 	}
-}
+}