工艺员查询修改002

blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java

@@ -356,7 +356,9 @@ public class UserController {
         //热表工艺员
         ids.add(2032373858255548418L);
         QueryWrapper<User> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("role_id",ids);
+//        queryWrapper.in("role_id",ids);
+        queryWrapper.like("role_id","2032373544077012993");
+        queryWrapper.like("role_id","2032373858255548418");
         List<User> list = userService.list(queryWrapper);
         return R.data(list);
     }

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

@@ -49,6 +49,7 @@ import org.springblade.system.pojo.entity.User;
 import org.springblade.system.pojo.vo.DeptVO;
 import org.springblade.system.pojo.vo.UserVO;
 import org.springblade.system.service.IDeptService;
+import org.springblade.system.service.IUserExtService;
 import org.springblade.system.service.IUserService;
 import org.springblade.system.wrapper.DeptWrapper;
 import org.springblade.system.wrapper.UserWrapper;
@@ -71,6 +72,7 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 
 	private final IUserService userService;
 	private final IWorkCenterClient workCenterClient;
+	private final IUserExtService userExtService;
 	@Override
 	public List<DeptVO> lazyList(String tenantId, Long parentId, Map<String, Object> param) {
 		// 设置租户ID
@@ -185,6 +187,9 @@ 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());
+
 		BasicClazz detail = workCenterClient.getClazzById(clazzId).getData();
 		if(detail != null){
 			String teamId = detail.getTeamMemberId();
@@ -192,12 +197,29 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 				List<Long> ids = Func.toLongList(teamId);
 				QueryWrapper<User> queryWrapper = new QueryWrapper<>();
 				queryWrapper.notIn("id",ids);
-				queryWrapper.in("role_id",roleIds);
+				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");
 //				queryWrapper.eq("dept_id",parentId);
 				teamUnSelects = userService.list(queryWrapper);
 			}else{
 				QueryWrapper<User> queryWrapper = new QueryWrapper<>();
-				queryWrapper.in("role_id",roleIds);
+//				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);
+				}
+//				queryWrapper.in("role_id",roleIds);
 //				queryWrapper.eq("dept_id",parentId);
 				teamUnSelects = userService.list(queryWrapper);
 			}
@@ -207,7 +229,10 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 				List<Long> ids = Func.toLongList(teamId);
 				QueryWrapper<User> queryWrapper = new QueryWrapper<>();
 				queryWrapper.in("id",ids);
-				queryWrapper.in("role_id",roleIds);
+//				queryWrapper.in("id",userIds);
+//				queryWrapper.in("role_id",roleIds);
+//				queryWrapper.like("role_id","2032373544077012993");
+//				queryWrapper.like("role_id","2032373858255548418");
 //				queryWrapper.eq("dept_id",parentId);
 				teamSelects = userService.list(queryWrapper);