ソースを参照

跟进列表管理人员下面无人日志BUG修复

anderx 4 年 前
コミット
9c3c7a6252

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

@@ -430,10 +430,15 @@
 			and a.aid = #{aid,jdbcType=VARCHAR}
 		</if>
 		<if test="power ==1  or power ==2">
-			and a.aid in
+			and a.aid
+			<if test="alist2 !=null">
 			<foreach item="item" collection="alist" separator="," open="(" close=")" index="">
-		       #{item}
+		      in #{item}
 		     </foreach> 
+			</if>
+			<if test="alist2 !=null">
+			 is null
+			 </if>
 		</if>
 		<if test="name != null and name != ''">
 			and a.identify_name like concat('%',#{name},'%')
@@ -478,11 +483,16 @@
 		<if test="power ==0">
 			and a.aid = #{aid,jdbcType=VARCHAR}
 		</if>
-		<if test="power ==1 or power ==2">
-			and a.aid in
+			<if test="power ==1  or power ==2">
+			and a.aid
+			<if test="alist2 !=null">
 			<foreach item="item" collection="alist" separator="," open="(" close=")" index="">
-		       #{item}
+		      in #{item}
 		     </foreach> 
+			</if>
+			<if test="alist2 !=null">
+			 is null
+			 </if>
 		</if>
 		<if test="name != null and name != ''">
 			and a.identify_name like concat('%',#{name},'%')

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

@@ -1655,7 +1655,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 				}
 				// 另外一个时间取转换时间
 				s2 = clo.getTransferTime();
-				System.out.println(clo.getName());
 				l1 = DateUtils.parseDate(s1, AFTConstants.YYYYMMDDHHMMSS).getTime();
 				l2 = DateUtils.parseDate(s2, AFTConstants.YYYYMMDDHHMMSS).getTime();
 				if (i == 0) {