zhangherong
2025-07-04 826d7a2d241c24a1ef47fe0e69533a18b3464bc2
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
@@ -791,6 +791,31 @@
      return collect;
   }
   /**
    * 选择用户
    * @param equipmentCode 选择的设备ID
    * @param factoryId 选择的工厂ID
    * @param positionCode 岗位编号
    * @return
    */
   @Override
   public List<UserSelector> selectOperatorFactoryList(String equipmentCode, String factoryId, String positionCode){
      LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
      queryWrapper.eq(SysUser::getPost, positionCode);
//      if(StringUtils.isNotBlank(equipmentCode)) {
//         queryWrapper.and(q -> q.isNull(SysUser::getEquipmentIds).or().eq(SysUser::getEquipmentIds, "").or().like(SysUser::getEquipmentIds, equipmentCode));
//      }
//      if(StringUtils.isNotBlank(factoryId)) {
//         queryWrapper.exists("select 1 from eam_base_factory_user t where t.user_id=sys_user.id and t.factory_id={0}", factoryId);
//      }
      queryWrapper.eq(SysUser::getDelFlag, CommonConstant.DEL_FLAG_0);
      queryWrapper.eq(SysUser::getStatus, CommonConstant.DEL_FLAG_1);
      queryWrapper.orderByDesc(SysUser::getId);
      List<SysUser> sysUsers = userMapper.selectList(queryWrapper);
      List<UserSelector> collect = sysUsers.stream().map(user -> new UserSelector(user.getId(), user.getUsername(), user.getRealname())).collect(Collectors.toList());
      return collect;
   }
   @Override
   public List<UserSelector> selectOperatorList(String positionCode) {
      LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();