工艺员查询修改003

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java

@@ -187,8 +187,8 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 		roleIds.add("2032373544077012993");
 		roleIds.add("2032373858255548418");
 
-		List<User> list = userExtService.listAllByRoleIds("2032373544077012993,2032373858255548418");
-		List<Long> userIds = list.stream().map(User::getId).collect(Collectors.toList());
+//		List<User> list = userExtService.listAllByRoleIds("2032373544077012993,2032373858255548418");
+//		List<Long> userIds = list.stream().map(User::getId).collect(Collectors.toList());
 
 		BasicClazz detail = workCenterClient.getClazzById(clazzId).getData();
 		if(detail != null){
@@ -197,13 +197,13 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 				List<Long> ids = Func.toLongList(teamId);
 				QueryWrapper<User> queryWrapper = new QueryWrapper<>();
 				queryWrapper.notIn("id",ids);
-				if(null != userIds && userIds.size() > 0){
-					queryWrapper.in("id",userIds);
-				}else{
-					List<Long> unUserIds = new ArrayList<>();
-					unUserIds.add(0L);
-					queryWrapper.in("id",unUserIds);
-				}
+//				if(null != userIds && userIds.size() > 0){
+//					queryWrapper.in("id",userIds);
+//				}else{
+//					List<Long> unUserIds = new ArrayList<>();
+//					unUserIds.add(0L);
+//					queryWrapper.in("id",unUserIds);
+//				}
 //				queryWrapper.in("role_id",roleIds);
 //				queryWrapper.like("role_id","2032373544077012993");
 //				queryWrapper.like("role_id","2032373858255548418");
@@ -212,13 +212,13 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 			}else{
 				QueryWrapper<User> queryWrapper = new QueryWrapper<>();
 //				queryWrapper.in("id",userIds);
-				if(null != userIds && userIds.size() > 0){
-					queryWrapper.in("id",userIds);
-				}else{
-					List<Long> unUserIds = new ArrayList<>();
-					unUserIds.add(0L);
-					queryWrapper.in("id",unUserIds);
-				}
+//				if(null != userIds && userIds.size() > 0){
+//					queryWrapper.in("id",userIds);
+//				}else{
+//					List<Long> unUserIds = new ArrayList<>();
+//					unUserIds.add(0L);
+//					queryWrapper.in("id",unUserIds);
+//				}
 //				queryWrapper.in("role_id",roleIds);
 //				queryWrapper.eq("dept_id",parentId);
 				teamUnSelects = userService.list(queryWrapper);