anderx 1 год назад
Родитель
Сommit
37a0356538

+ 2 - 2
src/main/java/com/goafanti/business/service/impl/RestrictProjectServiceImpl.java

@@ -194,12 +194,12 @@ public class RestrictProjectServiceImpl extends BaseMybatisDao<RestrictProjectMa
 //                long between = ChronoUnit.DAYS.between(now, endTime);
 //                e.setPrivateDays(between>0?(int)between:0);
                 //保持与旧版开发29-0一致,所以减去一天与私有客户同步
-                e.setPrivateDays(e.getDays()-1);
+                e.setPrivateDays(e.getDays());
             }else if (e.getType()==2){
 //                LocalDateTime endTime = lockTime.plusDays(270);
 //                long between = ChronoUnit.DAYS.between(now, endTime);
 //                e.setSignDays(between>0?(int)between:0);
-                e.setSignDays(e.getDays()-1);
+                e.setSignDays(e.getDays());
             }
         }
     }

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

@@ -570,7 +570,8 @@
 		<if test="area != null">
 			and b.location_area = #{area,jdbcType=INTEGER}
 		</if>
-		order by if(a.transfer_time &gt; um.last_follow_time, a.transfer_time,um.last_follow_time) ,a.`number`
+		order by if(um.last_follow_time is null,a.transfer_time,if(a.transfer_time &gt; um.last_follow_time, a.transfer_time, um.last_follow_time)) ,
+		         a.`number`
 		 <if test="page_sql != null">
     		${page_sql}
    		 </if>