Browse Source

限定项目列表修改

anderx 1 year ago
parent
commit
a81d5e4fb9

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

@@ -91,7 +91,7 @@ public class RestrictProjectServiceImpl extends BaseMybatisDao<RestrictProjectMa
             if (e.getType()==null){
                 e.setType(0);
             }
-            if (u.getType()==0&&u.getAid()!=null&&u.getAid().equals(AFTConstants.CAOJIN_AID)){
+            if (e.getType()==0&&u.getAid()!=null&&u.getAid().equals(AFTConstants.CAOJIN_AID)){
                 e.setType(1);
                 if (aname==null){
                     Admin admin = adminMapper.selectByPrimaryKey(AFTConstants.CAOJIN_AID);

+ 2 - 2
src/main/java/com/goafanti/common/task/ReleaseUserTask.java

@@ -105,7 +105,7 @@ public class ReleaseUserTask {
 						}else {
 							LocalDateTime endTime = lockTime.plusDays(30);
 							long between = ChronoUnit.DAYS.between(now, endTime);
-							if (between==0){
+							if (between<1){
 								ln.add(new Notice(UUID.randomUUID().toString(),date, 0, rp.getAid(),
 										NoticeStatus.RESTRICT_PROJECT_LOSE30.getCode(),
 										String.format("您的客户[%s]限时私有项目[%s]已丢失!",rp.getUserName(), rp.getProjectName())
@@ -126,7 +126,7 @@ public class ReleaseUserTask {
 						}else{
 							LocalDateTime endTime = lockTime.plusDays(270);
 							long between = ChronoUnit.DAYS.between(now, endTime);
-							if (between==0){
+							if (between<1){
 								ln.add(new Notice(UUID.randomUUID().toString(),date, 0, rp.getAid(),
 										NoticeStatus.RESTRICT_PROJECT_LOSE270.getCode(),
 										String.format("您的客户[%s]限时签单项目[%s]已丢失!",rp.getUserName(), rp.getProjectName())