youxiw2000 / trash · Commits

Commit a03e1526f204629429fdbb730c05d0c9b3663333

Authored by lichao
1 parent 8f445b8b
build: skipped

撤回

Inline Side-by-side
Showing 1 changed file with 7 additions and 7 deletions
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
  View file @a03e152
@@ -194,7 +194,7 @@ public class GarUserServiceImpl extends ServiceImpl<GarUserMapper, GarUser> @@ -194,7 +194,7 @@ public class GarUserServiceImpl extends ServiceImpl<GarUserMapper, GarUser>
194 194
195 //是否是投放点用户 195 //是否是投放点用户
196 List<DropPointInfo> list = dropPointInfoService.selectDropPointInfoListByPhone(loginDto.getTel()); 196 List<DropPointInfo> list = dropPointInfoService.selectDropPointInfoListByPhone(loginDto.getTel());
197 - vo.setTestUser(true); 197 + vo.setTestUser(CollectionUtil.isNotEmpty(list));
198 198
199 LoginUser loginUser = new LoginUser(); 199 LoginUser loginUser = new LoginUser();
200 ArrayList<SimpleGrantedAuthority> authorities = new ArrayList<SimpleGrantedAuthority>(); 200 ArrayList<SimpleGrantedAuthority> authorities = new ArrayList<SimpleGrantedAuthority>();
@@ -258,12 +258,12 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt; @@ -258,12 +258,12 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
258 vo.getRuleVos().add(ruleVo); 258 vo.getRuleVos().add(ruleVo);
259 259
260 } 260 }
261 -// for (LoginVo.RuleVo r : vo.getRuleVos()){  
262 -// //排除驾驶员、企业负责人、处理场所  
263 -// if(r.getUserType().equals(GlobalStatus.GarUserStatusEnum.DISPOSAL_SITE_USER.getDescription()) || r.getUserType().equals(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription()) || r.getUserType().equals(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription())){  
264 -// vo.setTestUser(true);  
265 -// }  
266 -// } 261 + for (LoginVo.RuleVo r : vo.getRuleVos()){
  262 + //排除驾驶员、企业负责人、处理场所
  263 + if(r.getUserType().equals(GlobalStatus.GarUserStatusEnum.DISPOSAL_SITE_USER.getDescription()) || r.getUserType().equals(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription()) || r.getUserType().equals(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription())){
  264 + vo.setTestUser(true);
  265 + }
  266 + }
267 267
268 268
269 this.saveOrUpdate(nUser); 269 this.saveOrUpdate(nUser);